Skip to content
Snippets Groups Projects
Commit cb208433 authored by Matteo Di Carlo's avatar Matteo Di Carlo
Browse files

Resolve ST-515 "Bug fixing for and docker images creation"

parent 462984f5
No related branches found
No related tags found
No related merge requests found
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
USER root USER root
......
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:latest as buildenv FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:9.3.2.1 as buildenv
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:9.3.2.1
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest as buildenv FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:9.3.3.1 as buildenv
RUN MTANGOREST_DOWNLOAD_URL=https://github.com/tango-controls/rest-server/releases/download/rest-server-1.14/rest-server-1.14.jar \ RUN MTANGOREST_DOWNLOAD_URL=https://github.com/tango-controls/rest-server/releases/download/rest-server-1.14/rest-server-1.14.jar \
&& DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \ && DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \
...@@ -15,7 +15,7 @@ RUN MTANGOREST_DOWNLOAD_URL=https://github.com/tango-controls/rest-server/releas ...@@ -15,7 +15,7 @@ RUN MTANGOREST_DOWNLOAD_URL=https://github.com/tango-controls/rest-server/releas
&& curl -fsSL "$MTANGOREST_DOWNLOAD_URL" -o mtangorest.jar \ && curl -fsSL "$MTANGOREST_DOWNLOAD_URL" -o mtangorest.jar \
&& apt-get purge -y --auto-remove $buildDeps && apt-get purge -y --auto-remove $buildDeps
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
COPY --from=buildenv /usr/local/lib/tango/mtangorest.jar /usr/local/lib/tango/mtangorest.jar COPY --from=buildenv /usr/local/lib/tango/mtangorest.jar /usr/local/lib/tango/mtangorest.jar
......
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
USER root USER root
......
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:9.3.4-rc7
ENTRYPOINT ["/usr/local/bin/TangoTest"] ENTRYPOINT ["/usr/local/bin/TangoTest"]
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# #
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
USER root USER root
......
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:latest as buildenv FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:9.3.2.1 as buildenv
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:9.3.2.1
USER root USER root
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment