Update packages, node.js version and Dockerfile

.dockerignore

@@ -1,7 +1,11 @@
 .git
 .gitignore
+.travis.yml
 README.md
+data
 Dockerfile
 docker-compose.yml
 node_modules
 logs
+LICENSE
+PROVISIONING.md

.github/workflows/publish.when-tagged.yml

@@ -0,0 +1,37 @@
+name: ci
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🔍 Checkout
+        uses: actions/checkout@v2
+
+      - name: ⚙ Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Get latest release version number
+        id: get_version
+        uses: battila7/get-version-action@v2
+
+      - name: 🔑 Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 🚀 Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}:latest
+            ghcr.io/${{ github.repository }}:${{ steps.get_version.outputs.version }}

Dockerfile

@@ -1,16 +1,39 @@
-FROM node:10-alpine
+############################################################
+#
+# base stage
+FROM node:12-alpine AS base
 
-COPY . /
+RUN apk upgrade --no-cache
+RUN apk add --no-cache ca-certificates
+
+
+############################################################
+#
+# build stage - just build the app
+FROM base AS build
 
 ENV NODE_ENV=development
-RUN apk add --no-cache -t build-deps make gcc g++ python libc-dev wget git dos2unix \
-    && apk add --no-cache ca-certificates \
-    && cd / \
-    && npm install \
-    && dos2unix docker-start.sh \
-    && chmod +x docker-start.sh \
-    && apk del build-deps \
-    && ls
+
+RUN apk add --no-cache \
+    make gcc g++ python3 libc-dev wget git dos2unix
+
+WORKDIR /srv/matrix-appservice-webhooks
+
+COPY package.json ./
+COPY package-lock.json ./
+COPY index.js ./
+COPY src ./src
+COPY config ./config
+COPY migrations ./migrations
+
+RUN npm install
+RUN npm audit fix
+
+
+############################################################
+#
+# final stage - put it all together
+FROM base AS final
 
 ENV NODE_ENV=production
 ENV WEBHOOKS_USER_STORE_PATH=/data/user-store.db
@@ -19,7 +42,13 @@ ENV WEBHOOKS_DB_CONFIG_PATH=/data/database.json
 ENV WEBHOOKS_ENV=docker
 
 WORKDIR /
-CMD /docker-start.sh
+
+COPY --from=build /srv/matrix-appservice-webhooks ./
+COPY docker-entrypoint.sh /usr/local/bin/
+RUN mkdir -p ./db
+
+ENTRYPOINT [ "/usr/local/bin/docker-entrypoint.sh" ]
+CMD [ "node", "index.js", "-p", "9000", "-c", "/data/config.yaml", "-f", "/data/appservice-registration-webhooks.yaml" ]
 
 EXPOSE 9000
 VOLUME ["/data"]

README.md

@@ -1,6 +1,6 @@
 # matrix-appservice-webhooks
 
-[![TravisCI badge](https://travis-ci.org/turt2live/matrix-appservice-webhooks.svg?branch=master)](https://travis-ci.org/turt2live/matrix-appservice-webhooks)
+![example branch parameter](https://github.com/netresearch/matrix-appservice-webhooks/actions/workflows/publish.when-tagged.yml/badge.svg?branch=master)
 
 Slack-compatible webhooks for Matrix. Talk about it on Matrix: [#webhooks:t2bot.io](https://matrix.to/#/#webhooks:t2bot.io)
 

docker-entrypoint.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+set -e
+
+# Migrate the registration file if possible
+if [ ! -f "/data/appservice-registration-webhooks.yaml" ] && [ -f "/data/appservice-webhooks-registration.yaml" ]; then
+    echo "Registration file does not exist - copy old one"
+    cp -v /data/appservice-webhooks-registration.yaml /data/appservice-registration-webhooks.yaml
+fi
+
+exec "$@"