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.

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

Jump to bottom

Remove target for d* #2213 #2280

Merged
merged 2 commits into from Dec 22, 2023
Merged

Remove target for d* #2213 #2280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c09beb
Remove target for d* #2213
nicholasdille Dec 21, 2023
518ea3d
Fixes for removal of target
nicholasdille Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions tools/dagger/Dockerfile.template
View file
Open in desktop
@@ -1,13 +1,15 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main

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
RUN <<EOF
check-github-release-asset "dagger/dagger" "v${version}" "dagger_v${version}_linux_${alt_arch}.tar.gz"
curl --silent --location --fail "https://github.com/dagger/dagger/releases/download/v${version}/dagger_v${version}_linux_${alt_arch}.tar.gz" \
| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
dagger
EOF
11 changes: 7 additions & 4 deletions tools/dasel/Dockerfile.template
View file
Open in desktop
@@ -1,14 +1,17 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main
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

RUN <<EOF
check-github-release-asset "TomWright/dasel" "v${version}" "dasel_linux_${alt_arch}"
curl --silent --location --fail --output "${prefix}${target}/bin/dasel" \
curl --silent --location --fail --output "${prefix}/bin/dasel" \
"https://github.com/TomWright/dasel/releases/download/v${version}/dasel_linux_${alt_arch}"
chmod +x "${prefix}${target}/bin/dasel"
chmod +x "${prefix}/bin/dasel"
EOF
18 changes: 10 additions & 8 deletions tools/datree/Dockerfile.template
View file
Open in desktop
@@ -1,20 +1,22 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main

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
RUN <<EOF
check-github-release-asset "datreeio/datree" "${version}" "datree-cli_${version}_Linux_${arch}.zip"
curl --silent --location --fail --remote-name "https://github.com/datreeio/datree/releases/download/${version}/datree-cli_${version}_Linux_${arch}.zip"
unzip -q -o -d "/tmp" "datree-cli_${version}_Linux_${arch}.zip"
rm "datree-cli_${version}_Linux_${arch}.zip"
mv "/tmp/datree" "${prefix}${target}/bin"
"${prefix}${target}/bin/datree" completion bash >"${prefix}${target}/share/bash-completion/completions/datree"
"${prefix}${target}/bin/datree" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/datree.fish"
"${prefix}${target}/bin/datree" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_datree"
mv "/tmp/datree" "${prefix}/bin"
"${prefix}/bin/datree" completion bash >"${prefix}/share/bash-completion/completions/datree"
"${prefix}/bin/datree" completion fish >"${prefix}/share/fish/vendor_completions.d/datree.fish"
"${prefix}/bin/datree" completion zsh >"${prefix}/share/zsh/vendor-completions/_datree"
EOF
RUN <<EOF
"${prefix}${target}/bin/datree" config set offline local
"${prefix}/bin/datree" config set offline local
EOF
9 changes: 6 additions & 3 deletions tools/dbui/Dockerfile.template
View file
Open in desktop
@@ -1,14 +1,17 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main
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

RUN <<EOF
check-github-release-asset "KenanBek/dbui" "v${version}" "dbui_Linux_${arch}.tar.gz"
curl --silent --location --fail "https://github.com/KenanBek/dbui/releases/download/v${version}/dbui_Linux_${arch}.tar.gz" \
| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
dbui
EOF
10 changes: 6 additions & 4 deletions tools/ddosify/Dockerfile.template
View file
Open in desktop
@@ -1,13 +1,15 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main

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
RUN <<EOF
check-github-release-asset "ddosify/ddosify" "v${version}" "ddosify_${version}_linux_${alt_arch}.tar.gz"
curl --silent --location --fail "https://github.com/ddosify/ddosify/releases/download/v${version}/ddosify_${version}_linux_${alt_arch}.tar.gz" \
| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
ddosify
EOF
17 changes: 10 additions & 7 deletions tools/delta/Dockerfile.template
View file
Open in desktop
@@ -1,11 +1,13 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main
FROM ghcr.io/uniget-org/tools/rust:latest AS rust

FROM ghcr.io/uniget-org/tools/rust:${ref} AS rust

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
COPY --from=rust / /
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" ]
COPY --from=rust / /usr/local
ARG DEBIAN_FRONTEND=noninteractive
RUN <<EOF
apt-get update
Expand All @@ -16,9 +18,10 @@ WORKDIR /tmp/github.com/dandavison/delta
ARG name
ARG version
RUN <<EOF
source "${target}/etc/profile.d/cargo.sh"
git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}" https://github.com/dandavison/delta .
export CARGO_HOME=/usr/local/cargo
export RUSTUP_HOME=/usr/local/rustup
export RUSTFLAGS='-C target-feature=+crt-static'
cargo build --release --target "${arch}-unknown-linux-gnu"
cp "target/${arch}-unknown-linux-gnu/release/delta" "${prefix}${target}/bin/"
cp "target/${arch}-unknown-linux-gnu/release/delta" "${prefix}/bin/"
EOF
14 changes: 8 additions & 6 deletions tools/dependency-check/Dockerfile.template
View file
Open in desktop
@@ -1,16 +1,18 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main

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
RUN <<EOF
check-github-release-asset "jeremylong/DependencyCheck" "v${version}" "dependency-check-${version}-release.zip"
url="https://github.com/jeremylong/DependencyCheck/releases/download/v${version}/dependency-check-${version}-release.zip"
filename="$(basename "${url}")"
curl --silent --location --fail --remote-name "${url}"
unzip -q -o -d "${prefix}${target}/opt" "${filename}"
ln --symbolic --relative --force "${target}/opt/dependency-check/bin/dependency-check.sh" "${prefix}${target}/bin/dependency-check.sh"
mv "${prefix}${target}/opt/dependency-check/bin/completion-for-dependency-check.sh" "${prefix}${target}/share/bash-completion/completions/dependency-check.sh"
unzip -q -o -d "${prefix}/opt" "${filename}"
ln --symbolic --relative --force "/opt/dependency-check/bin/dependency-check.sh" "${prefix}/bin/dependency-check.sh"
mv "${prefix}/opt/dependency-check/bin/completion-for-dependency-check.sh" "${prefix}/share/bash-completion/completions/dependency-check.sh"
EOF
16 changes: 9 additions & 7 deletions tools/depot/Dockerfile.template
View file
Open in desktop
@@ -1,17 +1,19 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main

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
RUN <<EOF
check-github-release-asset "depot/cli" "v${version}" "depot_${version}_linux_${alt_arch}.tar.gz"
curl --silent --location --fail "https://github.com/depot/cli/releases/download/v${version}/depot_${version}_linux_${alt_arch}.tar.gz" \
| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner \
| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner \
bin/depot

"${prefix}${target}/bin/depot" completion bash >"${prefix}${target}/share/bash-completion/completions/depot"
"${prefix}${target}/bin/depot" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/depot.fish"
"${prefix}${target}/bin/depot" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_depot"
"${prefix}/bin/depot" completion bash >"${prefix}/share/bash-completion/completions/depot"
"${prefix}/bin/depot" completion fish >"${prefix}/share/fish/vendor_completions.d/depot.fish"
"${prefix}/bin/depot" completion zsh >"${prefix}/share/zsh/vendor-completions/_depot"
EOF
16 changes: 9 additions & 7 deletions tools/devbox/Dockerfile.template
View file
Open in desktop
@@ -1,16 +1,18 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main

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
RUN <<EOF
check-github-release-asset "jetpack-io/devbox" "${version}" "devbox_${version}_linux_${alt_arch}.tar.gz"
curl --silent --location --fail "https://github.com/jetpack-io/devbox/releases/download/${version}/devbox_${version}_linux_${alt_arch}.tar.gz" \
| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner

"${prefix}${target}/bin/devbox" completion bash >"${prefix}${target}/share/bash-completion/completions/devbox"
"${prefix}${target}/bin/devbox" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/devbox.fish"
"${prefix}${target}/bin/devbox" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_devbox"
"${prefix}/bin/devbox" completion bash >"${prefix}/share/bash-completion/completions/devbox"
"${prefix}/bin/devbox" completion fish >"${prefix}/share/fish/vendor_completions.d/devbox.fish"
"${prefix}/bin/devbox" completion zsh >"${prefix}/share/zsh/vendor-completions/_devbox"
EOF
20 changes: 11 additions & 9 deletions tools/devcontainer/Dockerfile.template
View file
Open in desktop
@@ -1,13 +1,15 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main
FROM ghcr.io/uniget-org/tools/python:latest AS python
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/make:latest AS make

FROM ghcr.io/uniget-org/tools/python:${ref} AS python
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/make:${ref} AS make

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
COPY --link --from=python / /
Expand All @@ -19,12 +21,12 @@ apt-get update
apt-get -y install --no-install-recommends \
build-essential
EOF
WORKDIR ${prefix}${target}/libexec/devcontainer
WORKDIR ${prefix}/libexec/devcontainer
ARG name
ARG version
RUN <<EOF
npm install \
--omit=dev \
"@devcontainers/cli@${version}"
ln --symbolic --relative --force "${prefix}${target}/libexec/devcontainer/node_modules/.bin/devcontainer" "${prefix}${target}/bin/"
ln --symbolic --relative --force "${prefix}/libexec/devcontainer/node_modules/.bin/devcontainer" "${prefix}/bin/"
EOF
18 changes: 10 additions & 8 deletions tools/devpod/Dockerfile.template
View file
Open in desktop
@@ -1,17 +1,19 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main

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
RUN <<EOF
check-github-release-asset "loft-sh/devpod" "v${version}" "devpod-linux-${alt_arch}"
curl --silent --location --fail --output "${prefix}${target}/bin/devpod" \
curl --silent --location --fail --output "${prefix}/bin/devpod" \
"https://github.com/loft-sh/devpod/releases/download/v${version}/devpod-linux-${alt_arch}"
chmod +x "${prefix}${target}/bin/devpod"
chmod +x "${prefix}/bin/devpod"

"${prefix}${target}/bin/devpod" completion bash >"${prefix}${target}/share/bash-completion/completions/devpod"
"${prefix}${target}/bin/devpod" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/devpod.fish"
"${prefix}${target}/bin/devpod" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_devpod"
"${prefix}/bin/devpod" completion bash >"${prefix}/share/bash-completion/completions/devpod"
"${prefix}/bin/devpod" completion fish >"${prefix}/share/fish/vendor_completions.d/devpod.fish"
"${prefix}/bin/devpod" completion zsh >"${prefix}/share/zsh/vendor-completions/_devpod"
EOF
18 changes: 10 additions & 8 deletions tools/diffoci/Dockerfile.template
View file
Open in desktop
@@ -1,17 +1,19 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main

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
RUN <<EOF
check-github-release-asset "reproducible-containers/diffoci" "v${version}" "diffoci-v${version}.linux-${alt_arch}"
curl --silent --location --fail --output "${prefix}${target}/bin/diffoci" \
curl --silent --location --fail --output "${prefix}/bin/diffoci" \
"https://github.com/reproducible-containers/diffoci/releases/download/v${version}/diffoci-v${version}.linux-${alt_arch}"
chmod +x "${prefix}${target}/bin/diffoci"
chmod +x "${prefix}/bin/diffoci"

"${prefix}${target}/bin/diffoci" completion bash >"${prefix}${target}/share/bash-completion/completions/diffoci"
"${prefix}${target}/bin/diffoci" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/diffoci.fish"
"${prefix}${target}/bin/diffoci" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_diffoci"
"${prefix}/bin/diffoci" completion bash >"${prefix}/share/bash-completion/completions/diffoci"
"${prefix}/bin/diffoci" completion fish >"${prefix}/share/fish/vendor_completions.d/diffoci.fish"
"${prefix}/bin/diffoci" completion zsh >"${prefix}/share/zsh/vendor-completions/_diffoci"
EOF
12 changes: 7 additions & 5 deletions tools/dinit/Dockerfile.template
View file
Open in desktop
@@ -1,13 +1,15 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main

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
RUN <<EOF
# check-github-release-asset "foo/bar" "${version}" "foo-${version}-linux-amd64.tar.gz"
curl --silent --location --fail --output "${prefix}${target}/bin/dinit" \
curl --silent --location --fail --output "${prefix}/bin/dinit" \
"https://gitlab.com/tozd/dinit/-/releases/v${version}/downloads/linux-${alt_arch}/dinit"
chmod +x "${prefix}${target}/bin/dinit"
chmod +x "${prefix}/bin/dinit"
EOF
26 changes: 15 additions & 11 deletions tools/direnv/Dockerfile.template
View file
Open in desktop
@@ -1,23 +1,27 @@
#syntax=docker/dockerfile:1.6.0

ARG ref=main

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
RUN <<EOF
check-github-release-asset "direnv/direnv" "v${version}" "direnv.linux-${alt_arch}"
curl --silent --location --fail --output "${prefix}${target}/bin/direnv" \
curl --silent --location --fail --output "${prefix}/bin/direnv" \
"https://github.com/direnv/direnv/releases/download/v${version}/direnv.linux-${alt_arch}"
chmod +x "${prefix}${target}/bin/direnv"
curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv-fetchurl.1" \
chmod +x "${prefix}/bin/direnv"
curl --silent --location --fail --output "${prefix}/share/man/man1/direnv-fetchurl.1" \
"https://github.com/direnv/direnv/raw/v${version}/man/direnv-fetchurl.1"
curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv-stdlib.1" \
curl --silent --location --fail --output "${prefix}/share/man/man1/direnv-stdlib.1" \
"https://github.com/direnv/direnv/raw/v${version}/man/direnv-stdlib.1"
curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv.1" \
curl --silent --location --fail --output "${prefix}/share/man/man1/direnv.1" \
"https://github.com/direnv/direnv/raw/v${version}/man/direnv.1"
curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv.toml.1" \
curl --silent --location --fail --output "${prefix}/share/man/man1/direnv.toml.1" \
"https://github.com/direnv/direnv/raw/v${version}/man/direnv.toml.1"
EOF

COPY direnv.sh ${prefix}/etc/profile.d/
cat <<EOF >"${prefix}/etc/profile.d/direnv.sh"
#!/bin/bash
eval "\$(direnv hook bash)"
EOF
3 changes: 0 additions & 3 deletions tools/direnv/direnv.sh
View file
Open in desktop

This file was deleted.