GitHub actions testing (#107)

* test 1

* test 2

* remove accidental pasting in commit

* removed multi-platform for dev

* Revert "Add button to delete machine route"

This reverts commit 63041fd.

* modernized release workflow

* update version

* Migration to Svelte 4

* cleaned up version injection

* moved build arg below FROM

* increment release

Author: routerino

.github/workflows/publish-dev-image.yaml

@@ -16,29 +16,16 @@ jobs:
         id: gathervars
         run: |
           # get a current BUILD_DATE
-          echo "::set-output name=BUILD_DATE::$(date +%Y%m%d-%H%M%S)"
+          echo "BUILD_DATE=$(date +%Y%m%d-%H%M%S)" >> $GITHUB_ENV
           # set version based on BUILD_DATE
-          echo "::set-output name=VERSION::$(date +%Y.%m.%d)-development"
-
-          # setting tags
-          echo "::set-output name=TAG::development"
+          echo "VERSION=$(date +%Y.%m.%d)-development" >> $GITHUB_ENV
 
       - name: Checkout Repository
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: ${{ runner.os }}-buildx-
-
       - name: Log in to the Container registry
         uses: docker/login-action@v1
         with:
@@ -47,16 +34,13 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker Image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           build-args: |
-            BUILD_DATE=${{ steps.gathervars.outputs.BUILD_DATE }}
-            VERSION=${{ steps.gathervars.outputs.VERSION }}
+            BUILD_DATE=${{ env.BUILD_DATE }}
+            VERSION=${{ env.VERSION }}
           context: ./docker/development
           tags: |
             ghcr.io/${{ github.repository }}-dev:latest
-            ghcr.io/${{ github.repository }}-dev:${{ steps.gathervars.outputs.VERSION }}
-          platforms: linux/amd64,linux/arm64,linux/arm32v7
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
+            ghcr.io/${{ github.repository }}-dev:${{ env.VERSION }}
           push: true

.github/workflows/publish-release.yaml

@@ -10,30 +10,27 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Variable Gathering
         id: gathervars
         run: |
           NOT_PREVIOUSLY_PUBLISHED=0
           # get a current BUILD_DATE
           VERSION=$(jq -r '.version' ./package.json)
-          echo "::set-output name=BUILD_DATE::$(date +%Y%m%d-%H%M%S)"
-          echo "::set-output name=VERSION::$VERSION"
+          echo "BUILD_DATE=$(date +%Y%m%d-%H%M%S)" >> $GITHUB_ENV
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
 
           # setting tags
           if echo "$VERSION" | grep -q "beta"; then
-            TAGS="ghcr.io/${{ github.repository }}:beta, ghcr.io/${{ github.repository }}:$VERSION, ghcr.io/${{ github.repository }}:latest"
-            PRIMARY_TAG=latest
+            echo "TAGS=ghcr.io/${{ github.repository }}:beta, ghcr.io/${{ github.repository }}:$VERSION, ghcr.io/${{ github.repository }}:latest" >> $GITHUB_ENV
           else
-            TAGS="ghcr.io/${{ github.repository }}:release, ghcr.io/${{ github.repository }}:latest, ghcr.io/${{ github.repository }}:$VERSION"
-            PRIMARY_TAG=latest
+            echo "TAGS=ghcr.io/${{ github.repository }}:release, ghcr.io/${{ github.repository }}:latest, ghcr.io/${{ github.repository }}:$VERSION" >> $GITHUB_ENV
           fi
-          echo "::set-output name=TAG::$TAGS"
-          echo "::set-output name=PRIMARY_TAG::$PRIMARY_TAG"
+          echo "PRIMARY_TAG=latest" >> $GITHUB_ENV
           # check if version has already been published
           $(docker manifest inspect ghcr.io/${{ github.repository }}:$VERSION > /dev/null) || NOT_PREVIOUSLY_PUBLISHED=1
-          echo "::set-output name=NOT_PREVIOUSLY_PUBLISHED::$NOT_PREVIOUSLY_PUBLISHED"
+          echo "NOT_PREVIOUSLY_PUBLISHED=$NOT_PREVIOUSLY_PUBLISHED" >> $GITHUB_ENV
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -42,55 +39,55 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v1
-        if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }}
+        uses: docker/login-action@v2
+        if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }}
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker Image
-        uses: docker/build-push-action@v2
-        if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }}
+        uses: docker/build-push-action@v4
+        if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }}
         with:
           build-args: |
-            BUILD_DATE=${{ steps.gathervars.outputs.BUILD_DATE }}
-            VERSION=${{ steps.gathervars.outputs.VERSION }}
+            BUILD_DATE=${{ env.BUILD_DATE }}
+            VERSION=${{ env.VERSION }}
           context: ./docker/production
           tags: |
-            ${{ steps.gathervars.outputs.TAG }}
+            ${{ env.TAGS }}
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
           push: true
 
       - name: Extract build out of docker image
-        uses: shrink/actions-docker-extract@v1
-        if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }}
+        uses: shrink/actions-docker-extract@v2
+        if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }}
         id: extract
         with:
-          image: ghcr.io/${{ github.repository }}:${{ steps.gathervars.outputs.PRIMARY_TAG }}
+          image: ghcr.io/${{ github.repository }}:${{ env.PRIMARY_TAG }}
           path: web
 
       - name: create release asset
-        if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }}
+        if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }}
         run: |
           cd "${{ steps.extract.outputs.destination }}"
           7z a headscale-ui.zip web
 
       - name: Create Draft Release
         id: create_release
         uses: actions/create-release@v1
-        if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }}
+        if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ steps.gathervars.outputs.VERSION }}
+          tag_name: ${{ env.VERSION }}
           release_name: headscale-ui
           draft: true
           prerelease: false
 
       - name: upload asset to releases  
         uses: actions/upload-release-asset@v1.0.1
-        if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }}
+        if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -101,7 +98,7 @@ jobs:
 
       - name: publish release
         uses: eregon/publish-release@v1
-        if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }}
+        if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

docker/development/dockerfile

@@ -49,14 +49,4 @@ USER dev-user
 
 WORKDIR /data
 
-ENTRYPOINT /bin/sh /staging/scripts/2-initialise.sh#!/bin/sh
-
-#----#
-# placeholder for testing
-# while true; do sleep 1; done
-#----#
-
-# set file permissions if required
-if [ $(id -u) -ne $(stat -c %u /data) ]
-then
-…fi
+ENTRYPOINT /bin/sh /staging/scripts/2-initialise.sh

docker/production/dockerfile

@@ -1,10 +1,10 @@
+FROM node:lts AS build
+
 # arguments
 ARG VERSION="master"
 # Branch to check out
 ARG CHECKOUT_BRANCH="master"
 
-FROM node:lts AS build
-
 #environment variables
 ENV PROJECT_NAME="headscale-ui"
 # URL for the github/git location

docker/production/scripts/1-image-build.sh

@@ -2,9 +2,8 @@
 set -x
 
 # add dependencies
-# jq for parsing version information
 # git for cloning the repository
-apk add --no-cache jq git
+apk add --no-cache git
 
 #clone the project
 git clone ${PROJECT_URL} ${PROJECT_NAME}
@@ -15,7 +14,6 @@ git checkout ${CHECKOUT_BRANCH}
 npm install
 
 # inject the version number
-VERSION=$(jq -r '.version' package.json)
 sed -i "s/insert-version/${VERSION}/g" ./src/routes/settings.html/+page.svelte
 
 # build the project