Merge pull request #28 from NotAProton/main

Bump containers and add ARM64 builds
FastForwardTeam · Mar 25, 2023 · d840ae4 · d840ae4
2 parents 5be73bc + 8fcca7a
commit d840ae4
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 65 deletions.
diff --git a/.env b/.env
@@ -6,9 +6,9 @@ dbUserPass=changemetoo
 
 domain=localhost
 
-#use echo $(htpasswd -nb username password) to generate the the creds
-dashboardcreds=user:$apr1$MexAolZ7$qu78x6Ljq4AZjYCqgiyGn.
-db_access_creds=user:$apr1$MexAolZ7$qu78x6Ljq4AZjYCqgiyGn.
+#use echo $(htpasswd -nb username password) to generate the the creds, Use double dollar signs because of escaping
+dashboardcreds=user:$$apr1$$MexAolZ7$$qu78x6Ljq4AZjYCqgiyGn.
+db_access_creds=user:$$apr1$$MexAolZ7$$qu78x6Ljq4AZjYCqgiyGn.
 #db_access_creds is a http layer in front of adminer, so you need 2 layers of authentication before accessing the db
 
 acme_email=hello@example.com
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -1,8 +1,3 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
 name: Create and publish a Docker image
 
 on:
@@ -39,10 +34,18 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
         with:
           context: .
           push: true
+          platforms: linux/amd64,linux/arm64
+          provenance: false #workaround for github UI bug see https://github.com/orgs/community/discussions/45969
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,6 @@ letsencrypt
 node_modules
 .parcel-cache
 .cache
-dist
+dist
+private.pem
+public.pem
diff --git a/config/key.rsa b/config/key.rsa
diff --git a/config/key.rsa.pub b/config/key.rsa.pub
diff --git a/dist/.env b/dist/.env
@@ -6,9 +6,9 @@ dbUserPass=changemetoo
 
 domain=localhost
 
-#use echo $(htpasswd -nb username password) to generate the the creds
-dashboardcreds=user:$apr1$MexAolZ7$qu78x6Ljq4AZjYCqgiyGn.
-db_access_creds=user:$apr1$MexAolZ7$qu78x6Ljq4AZjYCqgiyGn.
+#use echo $(htpasswd -nb username password) to generate the the creds, Use double dollar signs because of escaping
+dashboardcreds=user:$$apr1$$MexAolZ7$$qu78x6Ljq4AZjYCqgiyGn.
+db_access_creds=user:$$apr1$$MexAolZ7$$qu78x6Ljq4AZjYCqgiyGn.
 #db_access_creds is a http layer in front of adminer, so you need 2 layers of authentication before accessing the db
 
 acme_email=hello@example.com
diff --git a/dist/docker-compose.yml b/dist/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   traefik:
-    image: "traefik:v2.5"
+    image: "traefik:v2.9"
     container_name: "traefik"
     command:
       # - "--log.level=DEBUG"
@@ -76,7 +76,7 @@ services:
       - internal
 
   db:
-    image: mariadb:10.2
+    image: mariadb:10.11
     environment:
       MYSQL_ROOT_PASSWORD: $dbRootPass
       MYSQL_DATABASE: $dbName
@@ -116,6 +116,7 @@ services:
 volumes:
   database_mysql:
 
+
 networks:
   web:
     external: true

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   traefik:
-    image: "traefik:v2.5"
+    image: "traefik:v2.9"
     container_name: "traefik"
     command:
       # - "--log.level=DEBUG"
@@ -27,15 +27,15 @@ services:
       - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"
     labels:
       # Dashboard api
-    - "traefik.enable=true"
-    - "traefik.http.routers.dashboard.rule=Host(`${domain}`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
-    - 'traefik.http.routers.dashboard.entrypoints=websecure'
-    - 'traefik.http.routers.dashboard.tls.certresolver=myresolver'
-    - 'traefik.http.routers.dashboard.service=api@internal'
-    - 'traefik.http.routers.dashboard.middlewares=auth'
-    - "traefik.http.middlewares.auth.basicauth.users=${dashboardcreds}"
-    # Dummy service for Swarm port detection. The port can be any valid integer value.
-    - 'traefik.http.services.api@internal.loadbalancer.server.port=8080'
+      - "traefik.enable=true"
+      - "traefik.http.routers.dashboard.rule=Host(`${domain}`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
+      - 'traefik.http.routers.dashboard.entrypoints=websecure'
+      - 'traefik.http.routers.dashboard.tls.certresolver=myresolver'
+      - 'traefik.http.routers.dashboard.service=api@internal'
+      - 'traefik.http.routers.dashboard.middlewares=auth'
+      - "traefik.http.middlewares.auth.basicauth.users=${dashboardcreds}"
+      # Dummy service for Swarm port detection. The port can be any valid integer value.
+      - 'traefik.http.services.api@internal.loadbalancer.server.port=8080'
 
     ports:
       - "443:443"
@@ -72,9 +72,9 @@ services:
     networks:
       - web
       - internal
-  
+
   db:
-    image: mariadb:10.2
+    image: mariadb:10.11
     environment:
       MYSQL_ROOT_PASSWORD: $dbRootPass
       MYSQL_DATABASE: $dbName
@@ -91,7 +91,6 @@ services:
     networks:
       - internal
 
-
   adminer:
     image: adminer
     restart: always
@@ -115,6 +114,7 @@ services:
 volumes:
   database_mysql:
 
+
 networks:
   web:
     external: true