Skip to content

Commit 4c1843a

Browse files
committed
Merge pull request #43 from arschles/dockerimage
fix(Dockerfile,deis-builder-rc.yaml): add DOCKERIMAGE env var
2 parents c5601b3 + fc3ba0e commit 4c1843a

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

manifests/deis-builder-rc.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ spec:
2323
env:
2424
- name: "EXTERNAL_PORT"
2525
value: "2223"
26-
# This var needs to be passed so that the minio client (https://github.com/minio/mc) will work in Alpine linux
27-
- name: "DOCKERIMAGE"
28-
value: "1"
2926
- name: POD_NAMESPACE
3027
valueFrom:
3128
fieldRef:

rootfs/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ RUN mkdir -p /var/run/sshd && rm -rf /etc/ssh/ssh_host*
3232
# install git and configure gituser
3333
ENV GITHOME /home/git
3434
ENV GITUSER git
35+
# this is so the minio client (https://github.com/minio/mc) works properly
36+
ENV DOCKERIMAGE=1
3537
RUN mkdir /apps
3638
RUN adduser -D -h $GITHOME $GITUSER
3739
RUN mkdir -p $GITHOME/.ssh && chown git:git $GITHOME/.ssh

0 commit comments

Comments
 (0)