From c24d266fc68ca95487215b315c1e4e21fa96ff53 Mon Sep 17 00:00:00 2001 From: Christoph Voigt Date: Tue, 21 Nov 2023 08:55:33 +0100 Subject: [PATCH] set correct context --- .github/workflows/build.yaml | 2 +- example-1-sidecars/Dockerfile | 2 +- example-2-redis/Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4fdc3b6..1a7fbf3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -53,7 +53,7 @@ jobs: name: Build and push Docker image uses: docker/build-push-action@v5 with: - # context: . + context: . push: ${{ github.event_name != 'pull_request' }} file: ${{ matrix.dockerfile }} labels: ${{ steps.meta.outputs.labels }} diff --git a/example-1-sidecars/Dockerfile b/example-1-sidecars/Dockerfile index 3f0e818..4b50e70 100644 --- a/example-1-sidecars/Dockerfile +++ b/example-1-sidecars/Dockerfile @@ -1,3 +1,3 @@ FROM scratch -COPY ./example-1-sidecars/spin.toml ./spin.toml +COPY ./spin.toml ./spin.toml COPY ../bin/spin_static_fs.wasm ./spin_static_fs.wasm diff --git a/example-2-redis/Dockerfile b/example-2-redis/Dockerfile index 14517f3..0b73c28 100644 --- a/example-2-redis/Dockerfile +++ b/example-2-redis/Dockerfile @@ -1,7 +1,7 @@ FROM scratch -COPY ./example-2-redis/spin.toml ./spin.toml +COPY ./spin.toml ./spin.toml # Remove this line once done testing -COPY ./example-2-redis/redis/runtime_config.toml ./runtime_config.toml +COPY ./redis/runtime_config.toml ./runtime_config.toml COPY ../bin/env_explorer.wasm ./env_explorer.wasm