File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1010env :
1111 REGISTRY : ghcr.io
1212 IMAGE_NAME : tsdsystem-app
13+ IMAGE_DB_NAME : tsdsystem-db
1314 IMAGE_TAG : latest
1415
1516jobs :
@@ -43,14 +44,22 @@ jobs:
4344 echo "IMAGE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
4445 fi
4546
46- - name : Build and export to Docker
47+ - name : Build TSDSystem app and export to Docker
4748 uses : docker/build-push-action@v6
4849 with :
4950 context : .
5051 file : ./docker/php/Dockerfile.prod
5152 load : true
5253 tags : ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
5354
55+ - name : Build TSDSystem db and export to Docker
56+ uses : docker/build-push-action@v6
57+ with :
58+ context : .
59+ file : ./docker/timescale/Dockerfile
60+ load : true
61+ tags : ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_DB_NAME }}:${{ env.IMAGE_TAG }}
62+
5463 - name : Test Run
5564 run : |
5665 docker run --rm -d ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
6473 tags : ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
6574 cache-from : type=gha
6675 cache-to : type=gha,mode=max
76+
77+ - name : Build and push db image
78+ uses : docker/build-push-action@v6
79+ with :
80+ context : .
81+ file : ./docker/timescale/Dockerfile
82+ push : true
83+ tags : ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_DB_NAME }}:${{ env.IMAGE_TAG }}
84+ cache-from : type=gha
85+ cache-to : type=gha,mode=max
86+
87+ - name : Logout from Docker Registry
88+ run : docker logout ${{ env.REGISTRY }}
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ RUN apt-get update \
1212
1313RUN docker-php-ext-install pdo pdo_pgsql pgsql
1414
15- # ENABLE mod rewrite
15+ # ENABLE mod rewrite
1616RUN a2enmod rewrite
1717
1818RUN apt-get clean && rm -rf /var/lib/apt/lists/*
@@ -23,9 +23,9 @@ WORKDIR /var/www/html/tsdws
2323
2424# Configure non-root user.
2525ARG PUID=1000
26- ENV PUID ${PUID}
26+ ENV PUID= ${PUID}
2727ARG PGID=1000
28- ENV PGID ${PGID}
28+ ENV PGID= ${PGID}
2929
3030RUN groupmod -o -g ${PGID} www-data && \
3131 usermod -o -u ${PUID} -g www-data www-data
You can’t perform that action at this time.
0 commit comments