Skip to content

fix: Move bare to special target #49

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.

Sign up for GitHub

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

Merged
limakzi merged 1 commit into from
Apr 9, 2025
Merged

fix: Move bare to special target #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,11 @@ jobs:
uses: docker/build-push-action@v6
with:
context: ./src/dockerfiles/${{ matrix.image }}
file: ./src/dockerfiles/${{ matrix.image }}/Dockerfile.${{ matrix.gap-build }}
file: ./src/dockerfiles/${{ matrix.image }}/Dockerfile
push: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
target: ${{ matrix.gap-build }}
platforms: linux/amd64,linux/arm64
cache-from: type=gha
cache-to: type=gha,mode=max`
Expand Down
10 changes: 3 additions & 7 deletions ...ckerfiles/ubuntu-2204-lts/Dockerfile.bare → src/dockerfiles/ubuntu-2204-lts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ RUN groupadd --system --gid ${GAP_USER_GID} ${GAP_USER_GROUPNAME} && \
useradd --system --gid ${GAP_USER_GID} --home-dir ${GAP_USER_HOMEDIR} --create-home ${GAP_USER_USERNAME}




FROM base AS build
FROM base AS buildbare
ARG GAP_VERSION
ARG GAP_DOWNLOAD_URL
ARG GAP_TARBALL_NAME
Expand Down Expand Up @@ -69,9 +67,7 @@ WORKDIR "./gap-${GAP_VERSION}"
RUN ./configure && MAKEFLAGS=-j8 make




FROM base AS result
FROM base AS bare

ARG GAP_VERSION
ARG GAP_USER_HOMEDIR
Expand Down Expand Up @@ -104,7 +100,7 @@ RUN apt-get update --yes && \
USER ${GAP_USER_USERNAME}

RUN mkdir -pv "$HOME/.gap/pkg"
COPY --chown=${GAP_USER_USERNAME}:${GAP_USER_GROUPNAME} --from=build "${GAP_USER_HOMEDIR}/gap-${GAP_VERSION}/" "${GAP_USER_HOMEDIR}/gap-${GAP_VERSION}//"
COPY --chown=${GAP_USER_USERNAME}:${GAP_USER_GROUPNAME} --from=buildbare "${GAP_USER_HOMEDIR}/gap-${GAP_VERSION}/" "${GAP_USER_HOMEDIR}/gap-${GAP_VERSION}//"
ADD --chown=${GAP_USER_USERNAME}:${GAP_USER_GROUPNAME} ${PACKAGE_MANAGER_DOWNLOAD_URL} ./
RUN tar -xvf ${PACKAGE_MANAGER_TARBALL_NAME} -C "$HOME/.gap/pkg"
RUN echo 'LoadPackage("PackageManager"); UpdatePackage("PackageManager", false); QuitGap(InstallRequiredPackages());' | gap --bare
Expand Down
Loading