Skip to content

Commit 52baf2f

Browse files
author
lijianguo
committed
chore(dockerfile): use drycc/base image
1 parent 19a424c commit 52baf2f

2 files changed

Lines changed: 27 additions & 9 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SHELL_SCRIPTS = $(wildcard _scripts/*.sh) \
1919
# The following variables describe the containerized development environment
2020
# and other build options
2121
DEV_ENV_IMAGE := ${DEV_REGISTRY}/drycc/go-dev
22-
DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
22+
DEV_ENV_WORK_DIR := /opt/drycc/go/src/${REPO_PATH}
2323
DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
2424
DEV_ENV_CMD_INT := docker run -it --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
2525

rootfs/Dockerfile

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
1-
FROM docker.io/minio/mc:latest as mc
2-
FROM docker.io/drycc/go-dev:latest as go-dev
3-
4-
FROM quay.io/containers/podman:latest
1+
FROM docker.io/drycc/base:bullseye
52

63
ADD . /
7-
COPY --from=mc /usr/bin/mc /bin/mc
8-
COPY --from=go-dev /usr/local/bin/pack /bin/pack
4+
ENV PODMAN_VERSION="3.4.4" \
5+
MC_VERSION="2022.02.26.03.58.31" \
6+
CADDY_VERSION="2.4.6" \
7+
PACK_VERSION="0.24.0"
98

10-
RUN /imagebuilder/install
9+
RUN install-packages procps psmisc \
10+
&& install-stack podman $PODMAN_VERSION \
11+
&& install-stack mc $MC_VERSION \
12+
&& install-stack caddy $CADDY_VERSION \
13+
&& install-stack pack $PACK_VERSION \
14+
&& rm -rf \
15+
/usr/share/doc \
16+
/usr/share/man \
17+
/usr/share/info \
18+
/usr/share/locale \
19+
/var/lib/apt/lists/* \
20+
/var/log/* \
21+
/var/cache/debconf/* \
22+
/etc/systemd \
23+
/lib/lsb \
24+
/lib/udev \
25+
/usr/lib/`echo $(uname -m)`-linux-gnu/gconv/IBM* \
26+
/usr/lib/`echo $(uname -m)`-linux-gnu/gconv/EBC* \
27+
&& mkdir -p /usr/share/man/man{1..8}
1128

1229
WORKDIR /app
1330
ENV HOME /tmp
1431
ENV XDG_DATA_HOME /tmp
1532
ENV XDG_CONFIG_HOME /tmp/.config
1633

17-
ENTRYPOINT ["/imagebuilder/build"]
34+
ENTRYPOINT ["init-stack", "/imagebuilder/build"]
35+

0 commit comments

Comments
 (0)