-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
4 additions
and
566 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
# This is an "initContainer" image used by odo to inject required tools for odo to work properly. | ||
# | ||
|
||
# Build Go stuff (SupervisorD, getlanguage and go-init) | ||
# Build Go stuff (SupervisorD, go-init) | ||
|
||
# If you are adding any features that require a higher version of golang, such as golang 1.16 for example, | ||
# please contact maintainers to check of the releasing systems can handle the newer versions. | ||
|
@@ -13,11 +13,6 @@ ADD vendor/supervisord /go/src/github.com/ochinchina/supervisord | |
WORKDIR /go/src/github.com/ochinchina/supervisord | ||
RUN CGO_ENABLED=0 GO111MODULE=off go build -o /tmp/supervisord | ||
|
||
RUN mkdir -p /go/src/github.com/openshift/odo-supervisord-image | ||
ADD get-language /go/src/github.com/openshift/odo-supervisord-image/get-language/ | ||
WORKDIR /go/src/github.com/openshift/odo-supervisord-image/get-language | ||
RUN CGO_ENABLED=0 go build -o /tmp/getlanguage getlanguage.go | ||
|
||
RUN mkdir -p /go/src/github.com/pablo-ruth/go-init | ||
ADD go-init/main.go /go/src/github.com/pablo-ruth/go-init/go-init.go | ||
RUN CGO_ENABLED=0 go build -o /tmp/go-init /go/src/github.com/pablo-ruth/go-init/go-init.go | ||
|
@@ -30,29 +25,20 @@ LABEL com.redhat.component=odo-init-container \ | |
name=ocp-tools-4/odo-init-image \ | ||
io.k8s.display-name=atomic-openshift-odo-init-image \ | ||
[email protected] \ | ||
summary="Odo init image is an init container used by odo to initialze a 'component'" | ||
summary="Odo init image is an init container used by odo to initialize a 'component'" | ||
|
||
# Change version as needed | ||
LABEL version=1.1.10 | ||
LABEL version=1.1.11 | ||
|
||
ENV ODO_TOOLS_DIR /opt/odo-init/ | ||
|
||
# SupervisorD | ||
RUN mkdir -p ${ODO_TOOLS_DIR}/conf ${ODO_TOOLS_DIR}/bin | ||
COPY supervisor.conf ${ODO_TOOLS_DIR}/conf/ | ||
COPY devfile-supervisor.conf ${ODO_TOOLS_DIR}/conf/ | ||
COPY --from=gobuilder /tmp/supervisord ${ODO_TOOLS_DIR}/bin/supervisord | ||
|
||
# Wrapper scripts | ||
COPY assemble-and-restart ${ODO_TOOLS_DIR}/bin | ||
COPY run ${ODO_TOOLS_DIR}/bin | ||
COPY s2i-setup ${ODO_TOOLS_DIR}/bin | ||
COPY devfile-command ${ODO_TOOLS_DIR}/bin | ||
COPY vendor/fix-permissions /usr/bin/fix-permissions | ||
COPY language-scripts ${ODO_TOOLS_DIR}/language-scripts/ | ||
|
||
# Get Language and go-init | ||
COPY --from=gobuilder /tmp/getlanguage ${ODO_TOOLS_DIR}/bin/getlanguage | ||
# Get go-init | ||
COPY --from=gobuilder /tmp/go-init ${ODO_TOOLS_DIR}/bin/go-init | ||
|
||
RUN chgrp -R 0 ${ODO_TOOLS_DIR} && \ | ||
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.