Merge branch 'dev'

Author: eidens

.github/workflows/build-images.yml

@@ -0,0 +1,41 @@
+name: Docker Image CI
+
+# This workflow builds the necessary Docker images for the sd-graph production system. The images are built on every
+# push to master and dev, which are the two branches used for deployment to the prod and staging servers. The images
+# are versioned with the branch name, which discards any older builds, but they are not needed at the moment and could
+# simply be rebuilt with the commands below.
+
+on:
+  push:
+    branches: ['master', 'dev']
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_SOURCE: https://github.com/source-data/sd-graph
+  IMAGE_REVISION: ${{ github.sha }}
+  IMAGE_TAG: ${{ github.ref_name }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Log in to the Container registry
+      uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build the Docker images
+      run: docker-compose -f docker-compose.ci.yml build
+
+    - name: Push the Docker images
+      run: docker-compose -f docker-compose.ci.yml push

compose/local/vuejs/Dockerfile

@@ -10,8 +10,7 @@ ENV PATH /app/node_modules/.bin:$PATH
 # install and cache app dependencies
 COPY ./frontend/package.json      /app/package.json
 COPY ./frontend/package-lock.json /app/package-lock.json
-RUN npm install
-RUN npm install @vue/cli
+RUN npm ci
 
 COPY ./compose/local/vuejs/start /start
 RUN sed -i 's/\r$//g' /start

compose/production/vuejs/Dockerfile

@@ -3,7 +3,7 @@
 FROM node:13.12 as build-stage
 WORKDIR /app
 COPY ./frontend/package*.json ./
-RUN npm install
+RUN npm ci
 COPY ./frontend .
 RUN npm run build
 

compose/production/vuejs/start

@@ -3,6 +3,8 @@
 # Set of scripts to be exectued on the remote host as part of the
 # database deployment task
 #
+export IMAGE_TAG="$(git branch --show-current)"
+
 echo '  * [remote] stopping docker'
 docker-compose -f production.yml down
 

deploy/__db__/remote

@@ -27,6 +27,7 @@ sub_production(){
         cd sd-graph/                                   && \
         git checkout master                            && \
         git pull                                       && \
+        export IMAGE_TAG="master"                      && \
         docker-compose -f production.yml build         && \
         docker-compose -f production.yml up -d
 EOF
@@ -39,7 +40,8 @@ sub_staging(){
         cd sd-graph/                                       && \
         git checkout dev                                   && \
         git pull                                           && \
-        docker-compose -f production.yml build             && \
+        export IMAGE_TAG="dev"                             && \
+        docker-compose -f production.yml pull              && \
         docker-compose -f production.yml up -d
 EOF
     echo "[deploy:staging] DONE :)"

deploy/code

@@ -12,7 +12,7 @@ mail_developers(){
   local body=$2
 
   if [ ! -z $LOG_FILE ]; then
-    local body="$2\n\n----------\n\nLast 50 lines of the log file @ $LOG_FILE\n\n$(tail -50 $LOG_FILE)"
+    local body="$2\n\nlog file: $LOG_FILE\n\nImportant messages in the log:\n\n$(grep -i error $LOG_FILE)\n\n----------\n\nLast 50 lines of the log:\n\n$(tail -50 $LOG_FILE)"
   fi
 
   echo -e "$body" | mail -s "[sd-graph deploy/db] $subject" $developers_emails

deploy/db

@@ -0,0 +1,31 @@
+# This file is used by the CI system (Github Actions) to build three of the five images that comprise the production
+# system as defined in production.yml (the other two use plain, pre-built images).
+# They are stored in the Github Container Registry under the image tag specified here. See the Github Actions workflow
+# definition for information on the environment variables used here.
+services:
+  flask:
+    image: ghcr.io/source-data/sd-graph_flask:${IMAGE_TAG}
+    build:
+      context: .
+      dockerfile: ./compose/production/flask/Dockerfile
+      labels:
+        org.opencontainers.image.source: ${IMAGE_SOURCE}
+        org.opencontainers.image.revision: ${IMAGE_REVISION}
+
+  traefik:
+    image: ghcr.io/source-data/sd-graph_traefik:${IMAGE_TAG}
+    build:
+      context: .
+      dockerfile: ./compose/production/traefik/Dockerfile
+      labels:
+        org.opencontainers.image.source: ${IMAGE_SOURCE}
+        org.opencontainers.image.revision: ${IMAGE_REVISION}
+
+  vuejs:
+    image: ghcr.io/source-data/sd-graph_vuejs:${IMAGE_TAG}
+    build:
+      context: .
+      dockerfile: ./compose/production/vuejs/Dockerfile
+      labels:
+        org.opencontainers.image.source: ${IMAGE_SOURCE}
+        org.opencontainers.image.revision: ${IMAGE_REVISION}