Skip to content

Commit 9d48991

Browse files
nicokantfrafra
authored andcommitted
Add configuration for osmit-tm4
1 parent f74d1f5 commit 9d48991

File tree

3 files changed

+52
-6
lines changed

3 files changed

+52
-6
lines changed

.github/workflows/osmit-build.yml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- osm-ita
7+
tags:
8+
- v*
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: 'Checkout GitHub Action'
15+
uses: actions/checkout@main
16+
17+
- name: 'Login to GitHub Container Registry'
18+
uses: docker/login-action@v1
19+
with:
20+
registry: ghcr.io
21+
username: ${{github.actor}}
22+
password: ${{secrets.GITHUB_TOKEN}}
23+
- name: Set output
24+
id: vars
25+
run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
26+
- name: 'Build Backend Image'
27+
env:
28+
RELEASE_VERSION: ${{ steps.vars.outputs.tag }}
29+
run: |
30+
docker build . -f ./scripts/docker/Dockerfile.backend --tag ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-backend:$GITHUB_SHA --tag ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-backend:$RELEASE_VERSION
31+
docker push ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-backend:$GITHUB_SHA
32+
docker push ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-backend:$RELEASE_VERSION
33+
- name: 'Build Frontend Image'
34+
env:
35+
RELEASE_VERSION: ${{ steps.vars.outputs.tag }}
36+
FRONTEND_ENV: ${{ vars.FRONTEND_ENV }}
37+
run: |
38+
echo "$FRONTEND_ENV" > tasking-manager.env
39+
docker build . -f ./scripts/docker/Dockerfile.frontend --tag ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-frontend:$GITHUB_SHA --tag ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-frontend:$RELEASE_VERSION
40+
docker push ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-frontend:$GITHUB_SHA
41+
docker push ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-frontend:$RELEASE_VERSION

docker-compose.override.yml

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ services:
1212
<<: *backend
1313
volumes:
1414
- .:/usr/src/app
15+
labels:
16+
- traefik.http.routers.backend.rule=Host(`localhost`) && PathPrefix(`/api/`)
17+
- traefik.http.services.backend.loadbalancer.server.port=5000
1518

1619
# Migration service
1720
migration:

docker-compose.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
version: "3.4"
33

44
x-backend-config: &backend
5-
image: hotosm-tasking-manager:backend
5+
image: ghcr.io/osmitalia/osmit-tm-backend:v4.6.2-hotfix
66
env_file: ${ENV_FILE:-tasking-manager.env}
77
depends_on:
88
- postgresql
@@ -18,7 +18,7 @@ services:
1818
container_name: backend
1919
restart: always
2020
labels:
21-
- traefik.http.routers.backend.rule=(Host(`127.0.0.1`) || Host(`localhost`)) && PathPrefix(`/api/`)
21+
- traefik.http.routers.backend.rule=Host(`osmit-tm4.wmcloud.org`) && PathPrefix(`/api/`)
2222
- traefik.http.services.backend.loadbalancer.server.port=5000
2323

2424
migration:
@@ -28,21 +28,23 @@ services:
2828
command: flask db upgrade
2929

3030
frontend:
31-
image: hotosm-tasking-manager:frontend
31+
image: ghcr.io/osmitalia/osmit-tm-frontend:v4.6.2-hotfix
3232
restart: always
3333
networks:
3434
- tm-web
3535
labels:
36-
- traefik.http.routers.frontend.rule=Host(`127.0.0.1`) || Host(`localhost`)
37-
- traefik.http.services.frontend.loadbalancer.server.port=3000
36+
- traefik.http.routers.frontend.rule=Host(`osmit-tm4.wmcloud.org`)
37+
- traefik.http.services.frontend.loadbalancer.server.port=80
3838

3939
postgresql:
40-
image: postgis/postgis:14-3.3
40+
image: mdillon/postgis:11
4141
container_name: postgresql
4242
restart: always
4343
env_file: ${ENV_FILE:-tasking-manager.env}
4444
networks:
4545
- tm-web
46+
volumes:
47+
- /srv/postgresql:/var/lib/postgresql/data
4648

4749
traefik:
4850
image: traefik:v2.10

0 commit comments

Comments
 (0)