Skip to content

Commit

Permalink
Remove Codenvy ci dockerfiles and scripts. (#56)
Browse files Browse the repository at this point in the history
Remove Codenvy ci dockerfiles and scripts. Move fix with che-machine-exec SIGINT termination to the correct Dockerfile.

Signed-off-by: Oleksandr Andriienko <[email protected]>
  • Loading branch information
AndrienkoAleksandr authored Nov 12, 2019
1 parent 2e47bb0 commit 783567f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 185 deletions.
14 changes: 10 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,18 @@ COPY . .
RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-w -s' -a -installsuffix cgo -o che-machine-exec .
RUN apk add --no-cache ca-certificates

RUN adduser -D -g '' unprivilegeduser
RUN adduser -D -g '' unprivilegeduser && \
mkdir -p /rootfs/tmp /rootfs/etc /rootfs/etc/ssl/certs /rootfs/go/bin && \
# In the `scratch` you can't use Dockerfile#RUN, because there is no shell and no standard commands (mkdir and so on).
# That's why prepare absent `/tmp` folder for scratch image
chmod 1777 /rootfs/tmp && \
cp -rf /etc/passwd /rootfs/etc && \
cp -rf /etc/ssl/certs/ca-certificates.crt /rootfs/etc/ssl/certs && \
cp -rf /go/src/github.com/eclipse/che-machine-exec/che-machine-exec /rootfs/go/bin

FROM scratch
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /etc/passwd /etc/passwd
COPY --from=builder /go/src/github.com/eclipse/che-machine-exec/che-machine-exec /go/bin/che-machine-exec

COPY --from=builder /rootfs /

USER unprivilegeduser

Expand Down
41 changes: 0 additions & 41 deletions build_and_push_docker_images.sh

This file was deleted.

36 changes: 0 additions & 36 deletions dockerfiles/ci/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions dockerfiles/dev/Dockerfile

This file was deleted.

81 changes: 0 additions & 81 deletions release.sh

This file was deleted.

4 changes: 2 additions & 2 deletions rhel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#

# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/rhel8/go-toolset
FROM registry.redhat.io/rhel8/go-toolset:1.11.13-18 as builder
FROM rhel8/go-toolset:1.11.13-18 as builder
ENV PATH=/opt/rh/go-toolset-1.11/root/usr/bin:$PATH \
GOPATH=/go/
USER root
Expand All @@ -20,7 +20,7 @@ RUN adduser unprivilegeduser && \
CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-w -s' -a -installsuffix cgo -o che-machine-exec . && \
mkdir -p /rootfs/tmp /rootfs/etc /rootfs/go/bin && \
# In the `scratch` you can't use Dockerfile#RUN, because there is no shell and no standard commands (mkdir and so on).
# That's why prepare absent in the scratch /tmp folder.
# That's why prepare absent `/tmp` folder for scratch image
chmod 1777 /rootfs/tmp && \
cp -rf /etc/passwd /rootfs/etc && \
cp -rf /go/src/github.com/eclipse/che-machine-exec/che-machine-exec /rootfs/go/bin
Expand Down

0 comments on commit 783567f

Please sign in to comment.