Skip to content

Commit

Permalink
Fixed commented copy commands #2213
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicholasdille
nicholasdille committed Dec 31, 2023
1 parent 8186b7e commit 8483e36
Show file tree
Hide file tree
Showing 32 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions @template/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ ARG version
#EOF

# python
#COPY --link --from=python / /
#COPY --link --from=shiv / /
#COPY --link --from=python / /usr/local/
#COPY --link --from=shiv / /usr/local/
#RUN <<EOF
#apt-get update
#apt-get -y install --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion tools/aws/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ apt-get -y install --no-install-recommends \
python3-venv \
python-is-python3
EOF
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/az/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/bogrod/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/checkov/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/cve-bin-tool/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/devcontainer/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
SHELL [ "bash", "-clo", "errexit" ]
ARG name
ARG version
COPY --link --from=python / /
COPY --link --from=python / /usr/local/
COPY --link --from=nodejs / /
COPY --link --from=npm / /
COPY --link --from=make / /
Expand Down
2 changes: 1 addition & 1 deletion tools/gita/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/gitlab-release/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/gitlabci-local/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/gsutil/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/httpie/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/it-depends/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/kitt/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
4 changes: 2 additions & 2 deletions tools/mkdocs/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ ARG ref=main
#FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=shiv / /
#COPY --link --from=python / /usr/local/
#COPY --link --from=shiv / /usr/local/
RUN <<EOF
apt-get update
apt-get -y install --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion tools/mu-repo/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/pass-audit/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=pipx / /usr/local/
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/pass-git-helper/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=pipx / /usr/local/
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/pass-import/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=pipx / /usr/local/
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/pipx/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /usr/local/
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/runlike/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/sbom2dot/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
ARG name
ARG version
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/sbomdiff/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/sbomtools/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
4 changes: 2 additions & 2 deletions tools/semgrep/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
ARG name
ARG version
#COPY --link --from=python / /
#COPY --link --from=shiv / /
#COPY --link --from=python / /usr/local/
#COPY --link --from=shiv / /usr/local/
RUN <<EOF
apt-get update
apt-get -y install --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion tools/shell-gpt/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ apt-get -y install --no-install-recommends \
EOF
ARG name
ARG version
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
shiv --output-file "${prefix}${target}/bin/sgpt" --console-script sgpt "shell-gpt==${version}"
Expand Down
2 changes: 1 addition & 1 deletion tools/termgraph/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/tern/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ref=main
FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv

FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/vexy/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/wordcloud/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/yamale/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tools/yamllint/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
#COPY --link --from=python / /
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
apt-get update
Expand Down

0 comments on commit 8483e36

Please sign in to comment.