Skip to content

Commit

Permalink
Use PG_MAJOR version as qwc-base-db image tag version, build images f…
Browse files Browse the repository at this point in the history
…or PG 13,14,15
  • Loading branch information
manisandro committed Oct 25, 2023
1 parent b7e2016 commit d13aba6
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 5 deletions.
25 changes: 23 additions & 2 deletions .github/workflows/qwc-base-db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,35 @@ jobs:
echo "tag=latest,${GITHUB_REF:10}" >>$GITHUB_OUTPUT
fi
- name: Build and publish qwc-base-db docker image
- name: Build and publish qwc-base-db docker image for pg 13
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: sourcepole/qwc-base-db
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
tags: "${{ steps.get_tag.outputs.tag }}"
tags: "13"
workdir: .
buildargs: PG_MAJOR=13,POSTGIS_VERSION=3

- name: Build and publish qwc-base-db docker image for pg 14
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: sourcepole/qwc-base-db
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
tags: "14"
workdir: .
buildargs: PG_MAJOR=14,POSTGIS_VERSION=3

- name: Build and publish qwc-base-db docker image for pg 15
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: sourcepole/qwc-base-db
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
tags: "15"
workdir: .
buildargs: PG_MAJOR=15,POSTGIS_VERSION=3

- name: Build and publish qwc-base-db-migrate docker image
uses: elgohr/Publish-Docker-Github-Action@v5
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# A postgres DB with the minimal QWC config DB setup

FROM postgres:15
ARG PG_MAJOR=15
FROM postgres:${PG_MAJOR}

ARG POSTGIS_VERSION=3
ENV PGDATA=/var/lib/postgresql/docker
ENV POSTGRES_PASSWORD=

ARG PG_MAJOR=15
ARG POSTGIS_VERSION=3

# Install postgis
RUN \
Expand Down

0 comments on commit d13aba6

Please sign in to comment.