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

Update docker #336

Merged
merged 4 commits into from
Jan 10, 2024
Merged

Update docker #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e1319a
ci(docker-build): add missing vhs dependency
vpayno Jan 10, 2024
e34b7e6
ci(build-docker): add nala package manager
vpayno Jan 10, 2024
33b7806
ci(build-docker): add xq and yq tools
vpayno Jan 10, 2024
7f974bf
ci(build-docker): add zx tool
vpayno Jan 10, 2024
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
2 changes: 1 addition & 1 deletion .github/docker/layer-00.00-base-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
main() {
layer_begin "${0}" "$@"

PACKAGES="acl apt-utils bash bsdextrautils coreutils curl jq moreutils sudo tmux tree util-linux vim-nox"
PACKAGES="acl apt-utils bash bsdextrautils coreutils curl jq moreutils nala sudo tmux tree util-linux vim-nox xq yq zx"

printf "Collecting apt installed packages:\n"
echo Running: apt list --installed \> "${HOME}"/apt-pkgs-start.txt
Expand Down
30 changes: 30 additions & 0 deletions .github/docker/layer-16.00-exercism-go.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,38 @@ main() {

declare -a PACKAGES
PACKAGES=(
ffmpeg # vhs
)

declare -a GH_REPOS
GH_REPOS=(
tsl0922/ttyd # vhs, no longer in Debian
)

declare -a DL_URLS

local repo
for repo in "${GH_REPOS[@]}"; do
local url
url="$(curl -sS https://api.github.com/repos/"${repo}"/releases/latest | jq -r --arg arch "$(arch)" '.assets[] | select(.browser_download_url | contains($arch)) | .browser_download_url')" || track_errors

DL_URLS+=("${url}")
done

local url
for url in "${DL_URLS[@]}"; do
local name="${url%%/releases/*}"
name="${name##*/}"

echo Running: curl -sS -L --output /usr/local/bin/"${name}" "${url}"
time curl -sS -L --output /usr/local/bin/"${name}" "${url}" || track_errors
printf "\n"

echo Running: chmod -v a+x /usr/local/bin/"${name}"
chmod -v a+x /usr/local/bin/"${name}" || track_errors
printf "\n"
done

declare -a CRATES
CRATES=(
cuelang.org/go/cmd/cue@latest
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY .github/docker /.github/docker

COPY .github/citools/ /.github/citools/

RUN sh .github/docker/layer-00.00-base-dependencies.sh ci-generic-debian && : 20231103-000
RUN sh .github/docker/layer-00.00-base-dependencies.sh ci-generic-debian && : 20240109-002

RUN bash .github/docker/layer-00.01-base-env_setup.sh ci-generic-debian && : 20231103-000

Expand All @@ -26,7 +26,7 @@ RUN bash .github/docker/layer-14.00-exercism-tools.sh ci-generic-debian && : 202

RUN bash .github/docker/layer-15.00-exercism-rust.sh ci-generic-debian && : 20231103-000

RUN bash .github/docker/layer-16.00-exercism-go.sh ci-generic-debian && : 20240106-000
RUN bash .github/docker/layer-16.00-exercism-go.sh ci-generic-debian && : 20240109-000

RUN bash .github/docker/layer-17.00-exercism-ruby.sh ci-generic-debian && : 20231103-000

Expand Down
Loading