Deploy in docker container (3)

project-dkg · May 18, 2024 · 52281e0 · 52281e0
1 parent 6e7b9ae
commit 52281e0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,8 +9,8 @@ on:
  workflow_dispatch:
 
 jobs:
- release:
- name: Release
+ release-package:
+ name: Release package
  runs-on: ubuntu-latest
  steps:
  - name: Checkout code
@@ -41,7 +41,8 @@ jobs:
  files: 'dkg-frontend-${{ env.TAG_NAME }}.tar.gz'
  prerelease: ${{ contains(github.ref, '.rc') && 'true' || 'false' }}
 
- release-dkg-frontend:
+ release-docker-image:
+ name: Release docker image
  runs-on: ubuntu-latest
  permissions:
  contents: read

diff --git a/config/Dockerfile b/config/Dockerfile
@@ -11,10 +11,10 @@ FROM nginx as production-stage
 COPY --from=build-stage /app/dist /var/www/dkg
 
 # Copy the Nginx configuration file
-COPY config/nginx.docker.conf /etc/nginx/conf.d/default.conf
+COPY config/nginx.docker.conf /etc/nginx/conf.d/default.conf.template
 COPY config/.htaccess /var/www/dkg
 
 EXPOSE 80
 EXPOSE 443
 
-CMD ["nginx", "-g", "daemon off;"]
+CMD /bin/bash -c "envsubst < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
diff --git a/config/nginx.docker.conf b/config/nginx.docker.conf
@@ -5,8 +5,8 @@ server {
  listen [::]:80 ;
  listen 443 ssl ;
  listen [::]:443 ssl ;
- ssl_certificate /etc/nginx/certificate/s.crt;
- ssl_certificate_key /etc/nginx/certificate/s.key;
+ ssl_certificate ${NGINX_SSL_CERTIFICATE_PATH};
+ ssl_certificate_key ${NGINX_SSL_CERTIFICATE_KEY_PATH};
  root /var/www/dkg;
  index index.html;
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "dkg-frontend",
- "version": "0.6.4",
+ "version": "0.6.5",
  "private": true,
  "scripts": {
  "dev": "vite",