From 06f908b603826819e5dd9e8938f1fd35fba21047 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 3 Aug 2024 02:22:17 +0200 Subject: [PATCH] Improve docker ignorefile honoring (#808) --- .github/workflows/deploy.yml | 6 ------ fly.toml | 4 ++++ other/{.dockerignore => Dockerfile.dockerignore} | 0 3 files changed, 4 insertions(+), 6 deletions(-) rename other/{.dockerignore => Dockerfile.dockerignore} (100%) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dd0cf063..bb327850 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -156,12 +156,6 @@ jobs: file: 'fly.toml' field: 'app' - # move Dockerfile to root - - name: 🚚 Move Dockerfile - run: | - mv ./other/Dockerfile ./Dockerfile - mv ./other/.dockerignore ./.dockerignore - - name: 🎈 Setup Fly uses: superfly/flyctl-actions/setup-flyctl@1.5 diff --git a/fly.toml b/fly.toml index e71a3d6e..7a24ed23 100644 --- a/fly.toml +++ b/fly.toml @@ -13,6 +13,10 @@ auto_rollback = true source = "data" destination = "/data" +[build] +dockerfile = "/other/Dockerfile" +ignorefile = "/other/Dockerfile.dockerignore" + [[services]] internal_port = 8080 processes = [ "app" ] diff --git a/other/.dockerignore b/other/Dockerfile.dockerignore similarity index 100% rename from other/.dockerignore rename to other/Dockerfile.dockerignore