Merge pull request #13 from jianxiaoguo/main

chore(dockerfile): use drycc/base image

Author: duanhongyi

Dockerfile

@@ -1,35 +1,37 @@
-FROM docker.io/minio/mc:latest as mc
-
-
 FROM docker.io/drycc/go-dev:latest AS build
 ARG LDFLAGS
 ADD . /app
 RUN export GO111MODULE=on \
   && cd /app \
-  && CGO_ENABLED=0 go build -ldflags "${LDFLAGS}" -o /usr/local/bin/boot boot.go
+  && CGO_ENABLED=0 init-stack go build -ldflags "${LDFLAGS}" -o /usr/local/bin/boot boot.go
 
 
-FROM docker.io/library/alpine:3.12
+FROM docker.io/drycc/base:bullseye
 
-RUN adduser \
-	-s /bin/sh \
-	-D \
-	-h /home/git \
-	git \
-	git
+RUN adduser --system \
+   --shell /bin/sh \
+   --home /home/git \
+   --group \
+   git
 
-COPY rootfs /
-COPY --from=mc /usr/bin/mc /bin/mc
+COPY rootfs/bin /bin/
+COPY rootfs/etc/ssh /etc/ssh/
+COPY rootfs/docker-entrypoint.sh /docker-entrypoint.sh
 COPY --from=build /usr/local/bin/boot /usr/bin/boot
 
-RUN apk add --update git sudo openssh-server coreutils tar xz jq bash \
+ENV MC_VERSION="2022.02.26.03.58.31" \
+  JQ_VERSION="1.6"
+
+RUN install-packages git openssh-server coreutils xz-utils tar \
+  && install-stack mc $MC_VERSION \
+  && install-stack jq $JQ_VERSION \
   && mkdir -p /var/run/sshd \
   && rm -rf /etc/ssh/ssh_host* \
   && mkdir /apps \
   && passwd -u git \
   && chmod +x /bin/create_bucket /bin/normalize_storage /docker-entrypoint.sh
 
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["init-stack", "/docker-entrypoint.sh"]
 
 CMD ["/usr/bin/boot", "server"]
 

Makefile

@@ -5,7 +5,7 @@ include versioning.mk
 # dockerized development environment variables
 REPO_PATH := github.com/drycc/${SHORT_NAME}
 DEV_ENV_IMAGE := ${DEV_REGISTRY}/drycc/go-dev
-DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
+DEV_ENV_WORK_DIR := /opt/drycc/go/src/${REPO_PATH}
 DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
 PLATFORM ?= linux/amd64,linux/arm64