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

Update infrastructure for rebuilding #2278

Merged
merged 2 commits into from
Dec 22, 2023
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
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
2 changes: 1 addition & 1 deletion tools/Dockerfile.tail
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
WORKDIR /uniget_bootstrap
RUN <<EOF
find . -type f,l \
find . -type f,l -printf '%P\n' \
| grep -v "/var/lib/uniget/manifests/${name}.txt" \
>"/uniget_bootstrap/var/lib/uniget/manifests/${name}.txt"
EOF
Expand Down
52 changes: 0 additions & 52 deletions tools/Dockerfile.template

This file was deleted.

Loading