Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing Docker builds and few improvements #1276

Merged
merged 3 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ jobs:
type=sha

- name: "Setup Docker Buildx"
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
platforms: linux/amd64

- name: "Login to GitHub Container Registry"
uses: docker/login-action@v2
Expand All @@ -44,10 +46,10 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: "Build and Publish Helper Image"
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: .
file: ./docker/ci/helper.Dockerfile
file: ./docker/helper.Dockerfile
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
Expand Down
13 changes: 0 additions & 13 deletions docker/ci/helper.Dockerfile

This file was deleted.

4 changes: 2 additions & 2 deletions docker/helper.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG SOURCES_DIR=/usr/src/ipa
FROM rust:bullseye AS builder
FROM rust:bookworm AS builder
ARG SOURCES_DIR

# Prepare helper binaries
Expand All @@ -10,7 +10,7 @@ RUN set -eux; \
cargo build --bin helper --release --no-default-features --features "web-app real-world-infra compact-gate"

# Copy them to the final image
FROM debian:bullseye-slim
FROM rust:slim-bookworm
ENV HELPER_BIN_PATH=/usr/local/bin/ipa-helper
ENV CONF_DIR=/etc/ipa
ARG SOURCES_DIR
Expand Down