From 09ef03f405315f7266ce65c28e3fd078322e649a Mon Sep 17 00:00:00 2001 From: Marco Malavolti <marco.malavolti@garr.it> Date: Sun, 30 Jul 2023 17:11:13 +0200 Subject: [PATCH] Renamed Dockerfile-dev --- Dockerfile-dev => Dockerfile | 5 ----- README-Docker.rst | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) rename Dockerfile-dev => Dockerfile (97%) diff --git a/Dockerfile-dev b/Dockerfile similarity index 97% rename from Dockerfile-dev rename to Dockerfile index c87f068..44b9f0f 100644 --- a/Dockerfile-dev +++ b/Dockerfile @@ -66,15 +66,10 @@ RUN ln -s /etc/apache2/conf-available/eccs.conf /etc/apache2/conf-enabled/eccs.c EXPOSE 80 EXPOSE 443 -#CMD tail -f /dev/null - #SUPERVISOR COPY supervisord.conf /etc/supervisor/supervisord.conf RUN mkdir -p /var/run/supervisord -#RUN mkdir -p /var/log/supervisor \ -# && chmod -R 0755 /var/log/supervisor COPY start.sh /start.sh RUN chmod +x /start.sh CMD /start.sh - diff --git a/README-Docker.rst b/README-Docker.rst index 6627dcc..5870a8d 100644 --- a/README-Docker.rst +++ b/README-Docker.rst @@ -52,10 +52,12 @@ Container Registry Authentication ``docker login gitlab.software.geant.org:5050`` +You need to create a Token if Federated access is used. + Build a new docker container image ---------------------------------- -``docker build -t gitlab.software.geant.org:5050/edugain/eccs -f Dockerfile .`` +``docker build -t gitlab.software.geant.org:5050/edugain/eccs:MAJOR.MINOR.PATCH -f Dockerfile .`` Load a container image to the Container Registry ------------------------------------------------ -- GitLab