Skip to content

Commit 2b15246

Browse files
fix deb package
1 parent f4a1019 commit 2b15246

3 files changed

Lines changed: 17 additions & 28 deletions

File tree

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name: Upload Release Asset
77

88
env:
99
swift_package_resolve: swift package resolve
10-
swift_build: swift build -c release # -Xswiftc -Ounchecked -Xswiftc -g -Xswiftc -static-stdlib -Xswiftc -cross-module-optimization
10+
swift_build: swift build --enable-test-discovery -c release -Xswiftc -Ounchecked -Xswiftc -g -Xswiftc -static-stdlib -Xswiftc -cross-module-optimization
1111
swift_test: swift test
1212
cache_version: 1
1313

@@ -44,7 +44,7 @@ jobs:
4444
uses: gravitl/github-action-fpm@master
4545
with:
4646
fpm_args: './build'
47-
fpm_opts: '-s dir -t deb -n geocoding-api -v ${{github.ref_name}} --deb-user geoocoding-api --deb-group geoocoding-api --deb-systemd build/geocoding-api.service --deb-default build/geocoding-api.env geocoding-api=/usr/local/bin/'
47+
fpm_opts: '-s dir -t deb -n geocoding-api -v ${{github.ref_name}} --deb-user geoocoding-api --deb-group geoocoding-api --deb-systemd build/geocoding-api.service --deb-default build/geocoding-api.env --before-install build/before-install.sh --before-upgrade build/before-install.sh geocoding-api=/usr/local/bin/'
4848
- name: Rename deb file
4949
run: mv geocoding-api_${{github.ref_name}}_amd64.deb geocoding-api_${{github.ref_name}}_focal_amd64.deb
5050
- name: Release

README.md

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ The standalone `geocodingapi` binary can run on any 64-bit linux with recent lib
1515

1616
```bash
1717
api install zip
18-
useradd --user-group --create-home --system --skel /dev/null --home-dir /app geocoding
19-
curl https://github.com/open-meteo/geocoding-api/releases/download/0.0.1/geocodingapi-ubuntu-20.04.gz | gunzip > /app/geocodingapi
20-
chmod +x /app/geocodingapi
21-
mkdir /app/data
22-
cd /app/data
18+
19+
wget https://github.com/open-meteo/geocoding-api/releases/download/0.0.5/geocoding-api_0.0.5_focal_amd64.deb
20+
dpkg -i geocoding-api_0.0.4_focal_amd64.deb
21+
22+
mkdir /var/lib/geocoding-api/data
23+
cd /var/lib/geocoding-api/data
2324
mkdir zip
2425
curl http://download.geonames.org/export/dump/allCountries.zip -o allCountries.zip
2526
curl http://download.geonames.org/export/dump/alternateNames.zip -o alternateNames.zip
@@ -28,29 +29,11 @@ unzip allCountries.zip
2829
unzip alternateNames.zip
2930
cd zip; unzip allCountries.zip; cd ..
3031

31-
systemctl enable geocoding8080
32-
systemctl start geocoding8080
33-
systemctl status geocoding8080
32+
systemctl enable geocoding-api.service
33+
systemctl start geocoding-api.service
34+
systemctl status geocoding-api.service
3435
```
3536

36-
- Create systemd service unit at `/etc/systemd/system/geocoding8080.service`
37-
``
38-
[Unit]
39-
Description = Run geocoding API on port 8080
40-
41-
[Service]
42-
Type=simple
43-
User=geocoding
44-
Group=geocoding
45-
WorkingDirectory=/app
46-
ExecStart=/app/geocodingapi serve -b 127.0.0.1:8080 --env production
47-
Restart=always
48-
RestartSec=1
49-
50-
[Install]
51-
WantedBy = multi-user.target
52-
``
53-
5437
Additionally, nginx proxy should be used
5538

5639
## Terms & Privacy

build/before-install.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash -e
2+
3+
echo "Running before-install.sh"
4+
5+
/usr/bin/mkdir -p /var/lib/geocoding-api/
6+
/usr/sbin/useradd --user-group geocoding-api || echo "User exists already"

0 commit comments

Comments
 (0)