diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 34f2c80a20..dc9415481c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -36,7 +36,7 @@ jobs: echo "run_build_windows=true" >> $GITHUB_OUTPUT break fi - if [[ $added_modified_file == "Dockerfile.linux"* ]]; then + if [[ $added_modified_file == "src/container/Dockerfile.linux"* ]]; then echo "$added_modified_file file changed" echo "run_build_windows=true" >> $GITHUB_OUTPUT break @@ -84,7 +84,7 @@ jobs: MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Build Docker Image - run: docker build -t mases.jnet -f Dockerfile.linux . + run: docker build -t mases.jnet -f .src/container/Dockerfile.linux . - name: Save Docker Image run: docker image save -o mases.jnet.linux.tar mases.jnet diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml index 0d0c0641b9..0409300f38 100644 --- a/.github/workflows/pullrequest.yaml +++ b/.github/workflows/pullrequest.yaml @@ -29,7 +29,7 @@ jobs: echo "run_build_windows=true" >> $GITHUB_OUTPUT break fi - if [[ $added_modified_file == "Dockerfile.linux"* ]]; then + if [[ $added_modified_file == "src/container/Dockerfile.linux"* ]]; then echo "$added_modified_file file changed" echo "run_build_windows=true" >> $GITHUB_OUTPUT break @@ -77,7 +77,7 @@ jobs: MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Build Docker Image - run: docker build -t mases.jnet -f Dockerfile.linux . + run: docker build -t mases.jnet -f ./src/container/Dockerfile.linux . # This workflow contains a single job called "build_release" build_pullrequest: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8b34f1362d..729e84ecb0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -63,7 +63,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v5 with: - file: Dockerfile.linux + file: ./src/container/Dockerfile.linux context: . platforms: linux/amd64,linux/arm64 push: true diff --git a/Dockerfile.linux b/src/container/Dockerfile.linux similarity index 100% rename from Dockerfile.linux rename to src/container/Dockerfile.linux