diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d3df41105..6847972e5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,17 +17,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: stable - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v1 - with: - install: true - driver-opts: network=host - - name: Login to Harbor - uses: docker/login-action@v1 - with: - registry: harbor.prod-aws.phylum.dev - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - name: Build Linux run: docker build lib/ --file lib/Dockerfile.linux --tag static-build - name: Build MacOS @@ -47,8 +36,6 @@ jobs: cp lib/src/bin/phylum.bash phylum-cli-release/ cp phylum-linux-x86_64 phylum-cli-release/ cp phylum-macos-x86_64 phylum-cli-release/ - cp phylum-linux-x86_64.minisig . - cp phylum-macos-x86_64.minisig . cp lib/install.sh . cp lib/src/bin/settings.yaml . cp lib/src/bin/phylum.bash . @@ -61,7 +48,7 @@ jobs: uses: haya14busa/action-cond@v1 id: preRelease with: - cond: ${{ contains(github.event.release.tag_name, 'rc') }} + cond: ${{ contains(github.ref, 'rc') }} if_true: 'true' # string value if_false: 'false' # string value - uses: softprops/action-gh-release@v0.1.7 diff --git a/lib/Dockerfile.linux b/lib/Dockerfile.linux index 9e06f1fac..039722267 100644 --- a/lib/Dockerfile.linux +++ b/lib/Dockerfile.linux @@ -13,7 +13,7 @@ ARG RUST_TARGET=x86_64-unknown-linux-musl # We use a multi-stage build here to get access to a full system when building # but still run in a scratch image # -FROM harbor.prod-aws.phylum.dev/phylum/rust/rust-musl:1.54.0 as planner +FROM phylumdev/rust-musl-builder:1.54.0 as planner ARG APP_PATH ARG CARGO_HOME USER root @@ -22,7 +22,7 @@ RUN cargo install cargo-chef COPY . . RUN cargo chef prepare --recipe-path recipe.json -FROM harbor.prod-aws.phylum.dev/phylum/rust/rust-musl:1.54.0 as cacher +FROM phylumdev/rust-musl-builder:1.54.0 as cacher ARG APP_PATH ARG CARGO_HOME USER root @@ -31,7 +31,7 @@ RUN cargo install cargo-chef COPY --from=planner ${APP_PATH}/recipe.json recipe.json RUN cargo chef cook --release --recipe-path recipe.json -FROM harbor.prod-aws.phylum.dev/phylum/rust/rust-musl:1.54.0 +FROM phylumdev/rust-musl-builder:1.54.0 ARG APP_PATH ARG CARGO_HOME USER root