diff --git a/.github/workflows/iroha2-custom-image.yml b/.github/workflows/iroha2-custom-image.yml index 4291caeedb..6fde716ba5 100644 --- a/.github/workflows/iroha2-custom-image.yml +++ b/.github/workflows/iroha2-custom-image.yml @@ -15,7 +15,6 @@ on: default: main env: - IROHA2_DOCKERFILE: Dockerfile.glibc IROHA2_PROFILE: profiling IROHA2_RUSTFLAGS: -C force-frame-pointers=on IROHA2_FEATURES: profiling @@ -93,7 +92,6 @@ jobs: "RUSTFLAGS=${{ env.IROHA2_RUSTFLAGS }}" "FEATURES=${{ env.IROHA2_FEATURES }}" "CARGOFLAGS=${{ env.IROHA2_CARGOFLAGS }}" - file: ${{env.IROHA2_DOCKERFILE }} context: . registry-glibc-image: @@ -132,7 +130,6 @@ jobs: push: true tags: docker.soramitsu.co.jp/iroha2/iroha:${{ inputs.PROFILER_NAME }}-${{ github.sha }} labels: commit=${{ github.sha }} - file: ${{env.IROHA2_DOCKERFILE }} context: . registry-alpine-image: diff --git a/.github/workflows/iroha2-dev-nightly.yml b/.github/workflows/iroha2-dev-nightly.yml index f4d7d7b3a5..1b7b5d6237 100644 --- a/.github/workflows/iroha2-dev-nightly.yml +++ b/.github/workflows/iroha2-dev-nightly.yml @@ -48,6 +48,5 @@ jobs: tags: hyperledger/iroha:dev-nightly-${{ github.sha }} labels: commit=${{ github.sha }} build-args: TAG=dev - file: Dockerfile.glibc # This context specification is required context: . diff --git a/.github/workflows/iroha2-dev-pr.yml b/.github/workflows/iroha2-dev-pr.yml index b451f9a0d0..61aae2aff9 100644 --- a/.github/workflows/iroha2-dev-pr.yml +++ b/.github/workflows/iroha2-dev-pr.yml @@ -168,7 +168,6 @@ jobs: tags: docker.soramitsu.co.jp/iroha2/iroha2:dev-${{ github.event.pull_request.head.sha }} labels: commit=${{ github.sha }} build-args: TAG=dev - file: Dockerfile.glibc # This context specification is required context: . @@ -211,7 +210,6 @@ jobs: with: context: . load: true - file: Dockerfile.glibc tags: | hyperledger/iroha:local hyperledger/iroha:dev diff --git a/.github/workflows/iroha2-dev.yml b/.github/workflows/iroha2-dev.yml index e59be25c7f..3227b7794d 100644 --- a/.github/workflows/iroha2-dev.yml +++ b/.github/workflows/iroha2-dev.yml @@ -62,7 +62,6 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: Dockerfile.glibc push: true tags: | hyperledger/iroha:dev diff --git a/.github/workflows/iroha2-release.yml b/.github/workflows/iroha2-release.yml index 9a433f0fe2..5d674d1ff5 100644 --- a/.github/workflows/iroha2-release.yml +++ b/.github/workflows/iroha2-release.yml @@ -9,7 +9,6 @@ env: CARGO_TERM_COLOR: always DEFAULTS_DIR: defaults WASM_TARGET_DIR: wasm/target/prebuilt - IROHA2_DOCKERFILE: Dockerfile.glibc IROHA2_PROFILE: profiling IROHA2_RUSTFLAGS: -C force-frame-pointers=on IROHA2_FEATURES: profiling @@ -61,7 +60,6 @@ jobs: with: context: . load: true - file: ${{env.IROHA2_DOCKERFILE }} tags: | hyperledger/iroha:${{ env.TAG }} docker.soramitsu.co.jp/iroha2/iroha:${{ env.TAG }} @@ -150,5 +148,4 @@ jobs: "RUSTFLAGS=${{ env.IROHA2_RUSTFLAGS }}" "FEATURES=${{ env.IROHA2_FEATURES }}" "CARGOFLAGS=${{ env.IROHA2_CARGOFLAGS }}" - file: ${{env.IROHA2_DOCKERFILE }} context: . diff --git a/Dockerfile.glibc b/Dockerfile similarity index 100% rename from Dockerfile.glibc rename to Dockerfile