Skip to content

Commit

Permalink
Add alpine 3.21
Browse files Browse the repository at this point in the history
  • Loading branch information
hason committed Dec 11, 2024
1 parent 9dd9d1d commit adea1ee
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG version=3.20

FROM alpine:$version as latest
FROM alpine:$version AS latest
LABEL maintainer="Martin Hasoň <[email protected]>"

ARG version
Expand All @@ -16,7 +16,7 @@ COPY rootfs /

RUN sed -i "s/\$ALPINE_RELEASE/$([ 'edge' = "$version" ] && echo "$version" || echo "v$version")/g" /etc/apk/repositories \
&& [ 'edge' = "$version" ] && sed -i 's/@testing //' /etc/apk/repositories || echo "ok" >/dev/null \
&& apk add -u busybox-extras busybox-suid su-exec inotify-tools dropbear dropbear-scp dropbear-dbclient dropbear-convert ca-certificates flock gettext libc6-compat libintl tini monit \
&& apk add -u busybox-extras busybox-suid su-exec inotify-tools dropbear dropbear-scp dropbear-dbclient dropbear-convert ca-certificates flock gettext libc6-compat libintl tini monit nano \
&& mv /usr/bin/envsubst /usr/local/bin/ \
&& apk del gettext \
&& wget -O /bin/wait-for https://raw.githubusercontent.com/eficode/wait-for/v2.2.4/wait-for && chmod a+x /bin/wait-for \
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,12 @@ Tags

Tag | Size
--- | ----
latest, 3.20 | ![](https://img.shields.io/docker/image-size/minidocks/base/latest?style=flat-square&logo=docker&label=size)
build, 3.20-build | ![](https://img.shields.io/docker/image-size/minidocks/base/build?style=flat-square&logo=docker&label=size)
latest, 3.21 | ![](https://img.shields.io/docker/image-size/minidocks/base/latest?style=flat-square&logo=docker&label=size)
build, 3.21-build | ![](https://img.shields.io/docker/image-size/minidocks/base/build?style=flat-square&logo=docker&label=size)
edge | ![](https://img.shields.io/docker/image-size/minidocks/base/edge?style=flat-square&logo=docker&label=size)
edge-build | ![](https://img.shields.io/docker/image-size/minidocks/base/edge-build?style=flat-square&logo=docker&label=size)
3.21 | ![](https://img.shields.io/docker/image-size/minidocks/base/3.21?style=flat-square&logo=docker&label=size)
3.21-build | ![](https://img.shields.io/docker/image-size/minidocks/base/3.21-build?style=flat-square&logo=docker&label=size)
3.20 | ![](https://img.shields.io/docker/image-size/minidocks/base/3.20?style=flat-square&logo=docker&label=size)
3.20-build | ![](https://img.shields.io/docker/image-size/minidocks/base/3.20-build?style=flat-square&logo=docker&label=size)
3.19 | ![](https://img.shields.io/docker/image-size/minidocks/base/3.19?style=flat-square&logo=docker&label=size)
Expand Down
6 changes: 4 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ versions="
3.19-build;3.19;build
3.20;3.20
3.20-build;3.20;build
3.21;3.21
3.21-build;3.21;build
edge;edge
edge-build;edge;build
build;3.20;build
latest;3.20
build;3.21;build
latest;3.21
"

build() {
Expand Down
6 changes: 6 additions & 0 deletions rootfs/etc/apk/repositories
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ https://dl-cdn.alpinelinux.org/alpine/$ALPINE_RELEASE/community
@edge https://dl-cdn.alpinelinux.org/alpine/edge/community
@edge https://dl-cdn.alpinelinux.org/alpine/edge/testing

@main321 https://dl-cdn.alpinelinux.org/alpine/v3.21/main
@community321 https://dl-cdn.alpinelinux.org/alpine/v3.21/community

@321 https://dl-cdn.alpinelinux.org/alpine/v3.21/main
@321 https://dl-cdn.alpinelinux.org/alpine/v3.21/community

@main320 https://dl-cdn.alpinelinux.org/alpine/v3.20/main
@community320 https://dl-cdn.alpinelinux.org/alpine/v3.20/community

Expand Down
8 changes: 6 additions & 2 deletions rootfs/etc/profile.d/color_prompt.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
NORMAL="\[\e[0m\]"
RED="\[\e[1;31m\]"
GREEN="\[\e[1;32m\]"
YELLOW="\[\e[1;33m\]"
NAME="(docker $(id -un):$(id -u):$(id -g))"
if [ "$(id -un)" = root ]; then
PS1="$RED(docker) $NORMAL\w# "
PS1="$RED$NAME$NORMAL \w# "
elif [ "$(stat -c "%U" "$PWD")" != "$(id -un)" ]; then
PS1="$YELLOW$NAME$NORMAL \w# "
else
PS1="$GREEN(docker) $NORMAL\w\$ "
PS1="$GREEN$NAME$NORMAL \w\$ "
fi

0 comments on commit adea1ee

Please sign in to comment.