Skip to content

Commit

Permalink
Prepare everything #2213
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholasdille committed Dec 21, 2023
1 parent c93bb37 commit 1ae7402
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 64 deletions.
20 changes: 11 additions & 9 deletions @template/Dockerfile.template
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main
#FROM ghcr.io/uniget-org/tools/go:latest AS go
#FROM ghcr.io/uniget-org/tools/rust:latest AS rust
#FROM ghcr.io/uniget-org/tools/python:latest AS python
#FROM ghcr.io/uniget-org/tools/shiv:latest AS shiv
#FROM ghcr.io/uniget-org/tools/nodejs:latest AS nodejs
#FROM ghcr.io/uniget-org/tools/npm:latest AS npm

#FROM ghcr.io/uniget-org/tools/go:${ref} AS go
#FROM ghcr.io/uniget-org/tools/rust:${ref} AS rust
#FROM ghcr.io/uniget-org/tools/python:${ref} AS python
#FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
#FROM ghcr.io/uniget-org/tools/nodejs:${ref} AS nodejs
#FROM ghcr.io/uniget-org/tools/npm:${ref} AS npm

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
FROM nicholasdille/ubuntu:22.04 AS prepare
COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
ARG name
ARG version

Expand Down
4 changes: 1 addition & 3 deletions tools/Dockerfile.tail
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ ARG name
ARG version
ARG deps
ARG tags
ARG prefix_override=/uniget_bootstrap
ENV prefix=${prefix_override}
COPY --from=prepare ${prefix} /
COPY --from=prepare /uniget_bootstrap /
LABEL org.opencontainers.image.source="https://github.com/uniget-org/tools" \
org.opencontainers.image.ref.name="${ref}" \
org.opencontainers.image.title="${name}" \
Expand Down
52 changes: 0 additions & 52 deletions tools/Dockerfile.template

This file was deleted.

0 comments on commit 1ae7402

Please sign in to comment.