Build in action and fixes

sitespeedio · Nov 11, 2024 · 32946a6 · 32946a6
1 parent 043d067
commit 32946a6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/.env b/.env
@@ -7,4 +7,7 @@ POSTGRESQL_DOCKER_VERSION=16.2
 MINIO_ROOT_USER=sitespeedio
 MINIO_ROOT_PASSWORD=tracksofmytears
 MINIO_DOCKER_VERSION=RELEASE.2024-05-10T01-41-38Z
-MINIO_MC_DOCKER_VERSION=RELEASE.2024-10-08T09-37-26Z
+MINIO_MC_DOCKER_VERSION=RELEASE.2024-10-08T09-37-26Z
+SITESPEED_IO_SERVER_VERSION=latest
+SITESPEED_IO_TESTRUNNER_VERSION=latest
+RESULT_BASE_URL=http://127.0.0.1:9000/sitespeedio
diff --git a/.github/workflows/build-docker-server-release.yml b/.github/workflows/build-docker-server-release.yml
@@ -41,7 +41,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: ./server/
-          file: ./server/Dockerile
+          file: ./server/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           provenance: false

diff --git a/.github/workflows/build-docker-testrunner-release.yml b/.github/workflows/build-docker-testrunner-release.yml
@@ -41,7 +41,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: ./testrunner/
-          file: ./testrunner/Dockerile
+          file: ./testrunner/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           provenance: false

diff --git a/.github/workflows/docker-local-linux.yml b/.github/workflows/docker-local-linux.yml
@@ -15,7 +15,14 @@ jobs:
       with:
         node-version: '20.x'
     - uses: actions/checkout@v4
+    - name: Build server
+      run: docker build --load --tag sitespeedio/server:local-action -f ./server/Dockerfile server
+    - name: Build testrunner
+      run: docker build --load  --tag sitespeedio/testrunner:local-action -f ./testrunner/Dockerfile testrunner
     - name: Start dependencies
+      env:
+        SITESPEED_IO_SERVER_VERSION: "local-action"
+        SITESPEED_IO_TESTRUNNER_VERSION: "local-action"
       run: docker compose -f docker-compose.yml -f docker-compose-local.yml up -d
     - name: Show versions
       run: |

diff --git a/docker-compose-local.yml b/docker-compose-local.yml
@@ -1,6 +1,6 @@
 services:
   sitespeed.io-server:
-    image: sitespeedio/server:latest
+    image: sitespeedio/server:${SITESPEED_IO_SERVER_VERSION}
     environment:
       redis_host: keydb
       redis_port: 6379
@@ -19,7 +19,7 @@ services:
       - postgresql
       - minio
   sitespeed.io-testrunner:
-    image: sitespeedio/testrunner:latest
+    image: sitespeedio/testrunner:${SITESPEED_IO_TESTRUNNER_VERSION}
     environment:
       redis_host: keydb
       redis_port: 6379
@@ -32,7 +32,7 @@ services:
       sitespeed.io_s3_region: "motown"
       sitespeed.io_s3_options_forcePathStyle: true
       sitespeed.io_s3_removeLocalResult: true
-      sitespeed.io_resultBaseURL: "http://127.0.0.1:9000/sitespeedio"
+      sitespeed.io_resultBaseURL: ${RESULT_BASE_URL}
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /tmp:/tmp