File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11FROM docker.io/drycc/base:bullseye
22
3- RUN adduser --system \
4- --shell /bin/bash \
5- --disabled-password \
6- --home /workspace \
7- --group \
8- drycc
3+ ARG DRYCC_UID=1001
4+ ARG DRYCC_GID=1001
5+ ARG DRYCC_HOME_DIR=/workspace
6+
7+ RUN groupadd drycc --gid ${DRYCC_GID} \
8+ && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}
99
1010ENV PYTHON_VERSION=3.10.2
11- COPY . /workspace
12- WORKDIR /workspace
11+ COPY . ${DRYCC_HOME_DIR}
12+ WORKDIR ${DRYCC_HOME_DIR}
1313
1414RUN export DEBIAN_FRONTEND=noninteractive \
1515 && install-stack python $PYTHON_VERSION && . init-stack \
@@ -28,7 +28,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
2828 /usr/lib/`echo $(uname -m)`-linux-gnu/gconv/IBM* \
2929 /usr/lib/`echo $(uname -m)`-linux-gnu/gconv/EBC* \
3030 && mkdir -p /usr/share/man/man{1..8} \
31- && chown -R drycc:drycc /workspace
31+ && chown -R drycc:drycc ${DRYCC_HOME_DIR}
3232
3333USER drycc
3434EXPOSE 8000
Original file line number Diff line number Diff line change @@ -11,7 +11,6 @@ MKDOCSSERVE = $(MKDOCS) serve -a 0.0.0.0:8000
1111SHORT_NAME ?= workflow
1212VERSION ?= git-$(shell git rev-parse --short HEAD)
1313IMAGE := ${SHORT_NAME}:${VERSION}
14-
1514REPO_PATH := github.com/drycc/${SHORT_NAME}
1615DEV_ENV_WORK_DIR := /src/${REPO_PATH}
1716DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} -p 8000:8000
@@ -41,6 +40,7 @@ test: build
4140 $(TEST_CMD )
4241
4342docker-build-docs :
43+ $(shell chown -R 1001:1001 ${CURDIR})
4444 $(DEV_ENV_CMD ) ${IMAGE} $(BUILD_CMD )
4545
4646docker-test : docker-build-docs
Original file line number Diff line number Diff line change 177177
178178 helm install traefik drycc/traefik \
179179 --namespace traefik \
180- --create-namespace --wait - f - << EOF
180+ --create-namespace -f - << EOF
181181service:
182182 annotations:
183183 metallb.universe.tf/address-pool: public
@@ -191,7 +191,7 @@ ingressClass:
191191additionalArguments:
192192- "--entrypoints.websecure.http.tls"
193193- "--experimental.http3=true"
194- - "--entrypoints.name.enablehttp3=true "
194+ - "--entrypoints.name.http3 "
195195EOF
196196 helm install cert-manager drycc/cert-manager --namespace cert-manager --create-namespace --set installCRDs=true --wait
197197 helm install catalog drycc/catalog \
You can’t perform that action at this time.
0 commit comments