From 30a00730ec06e86ea7ee47b6b4c8bb327f97e636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Fuch=C3=9F?= Date: Fri, 7 Oct 2022 23:38:30 +0000 Subject: [PATCH] Update to Artemis 5.10.2 --- .env | 12 +-- README.md | 4 +- defaults/templates/default.conf.template | 20 ++--- base.yml => docker-compose.yml | 65 +++++++--------- docker/artemis-client/Dockerfile.fast | 27 ------- docker/artemis-client/Dockerfile.manual | 44 ----------- .../defaults/artemis.conf.template | 23 ------ docker/artemis-client/defaults/nginx.conf | 32 -------- docker/artemis-server/Dockerfile.fast | 52 ------------- docker/artemis-server/Dockerfile.manual | 74 ------------------- docker/artemis-server/bootstrap.sh | 50 ------------- docker/artemis-server/stop-supervisor.sh | 8 -- docker/artemis-server/supervisord.conf | 17 ----- docker/gitlab/Dockerfile | 4 +- fast-build.yml | 10 --- manual-build.yml | 15 ---- 16 files changed, 43 insertions(+), 414 deletions(-) rename base.yml => docker-compose.yml (70%) delete mode 100644 docker/artemis-client/Dockerfile.fast delete mode 100644 docker/artemis-client/Dockerfile.manual delete mode 100644 docker/artemis-client/defaults/artemis.conf.template delete mode 100644 docker/artemis-client/defaults/nginx.conf delete mode 100644 docker/artemis-server/Dockerfile.fast delete mode 100644 docker/artemis-server/Dockerfile.manual delete mode 100644 docker/artemis-server/bootstrap.sh delete mode 100644 docker/artemis-server/stop-supervisor.sh delete mode 100644 docker/artemis-server/supervisord.conf delete mode 100644 fast-build.yml delete mode 100644 manual-build.yml diff --git a/.env b/.env index e91375d..4fa5550 100644 --- a/.env +++ b/.env @@ -1,12 +1,8 @@ -ARTEMIS_VERSION=5.4.0 -ARTEMIS_GIT_REPOSITORY=https://github.com/kit-sdq/Artemis -PROFILES=prod,jenkins,gitlab,artemis,scheduling,saml2 +ARTEMIS_VERSION=5.10.2 +GITLAB_VERSION=14.4.2-ce.0 -CUSTOM_PRIVACY_STATEMENT=./branding/privacy.html -CUSTOM_IMPRINT=./branding/imprint.html -CUSTOM_ABOUT=./branding/about-us.json +PROFILES=prod,jenkins,gitlab,artemis,scheduling,saml2 GITLAB_HTTP_PORT=8880 -GITLAB_HTTPS_PORT=8443 -GITLAB_SSH_PORT=2222 +GITLAB_SSH_PORT=222 JENKINS_HTTP_PORT=7780 diff --git a/README.md b/README.md index 0d5ee58..fe0c106 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Note: You can choose whether you want a full build: manual-build.yml or a fast b 1. Clone the repository -2. Run `docker-compose -f base.yml -f [fast-build.yml|manual-build.yml] up -d` and wait for the initial startup of the backend (config files will be copied). After that, stop the backend: `docker-compose -f base.yml -f [fast-build.yml|manual-build.yml] stop artemis-be` +2. Run `docker compose up -d` and wait for the initial startup of the backend (config files will be copied). After that, stop the backend: `docker-compose stop artemis` 3. Configure Artemis with Jenkins and Gilab as usual. Setup SAML using the configuration file as follows: The application-saml2.yml must look like that: @@ -43,6 +43,6 @@ info.saml2.enable-password: true ``` 4. (Enable Debug output) -5. Start the stack using ` docker-compose -f base.yml -f [fast-build.yml|manual-build.yml] up -d` +5. Start the stack using ` docker-compose up -d` 6. Log in with SAML2 using `user1` and `user1pass` 7. User mail addresses are fixed, testing is in this configuration only possible when overwriting the user information in the SAML docker. diff --git a/defaults/templates/default.conf.template b/defaults/templates/default.conf.template index b69a74b..80dbc51 100644 --- a/defaults/templates/default.conf.template +++ b/defaults/templates/default.conf.template @@ -13,43 +13,39 @@ server { # Proxy API requests location /api { include /etc/nginx/proxy.conf; - proxy_pass http://artemis-be:8080/api; + proxy_pass http://artemis:8080/api; } location /management { include /etc/nginx/proxy.conf; - proxy_pass http://artemis-be:8080/management; + proxy_pass http://artemis:8080/management; } location /v2 { include /etc/nginx/proxy.conf; - proxy_pass http://artemis-be:8080/v2; + proxy_pass http://artemis:8080/v2; } location /time { include /etc/nginx/proxy.conf; - proxy_pass http://artemis-be:8080/time; + proxy_pass http://artemis:8080/time; } location /saml2 { include /etc/nginx/proxy.conf; - proxy_pass http://artemis-be:8080/saml2; + proxy_pass http://artemis:8080/saml2; } location /login { include /etc/nginx/proxy.conf; - proxy_pass http://artemis-be:8080/login; + proxy_pass http://artemis:8080/login; } location /websocket { include /etc/nginx/proxy.conf; - proxy_pass http://artemis-be:8080/websocket; + proxy_pass http://artemis:8080/websocket; proxy_pass_header X-XSRF-TOKEN; } location / { - if (-f /sync/waiting-backend) { - return 200 'Artemis is updatingArtemis is currently updating .. please try again in 5 min'; - add_header Content-Type text/html; - } include /etc/nginx/proxy.conf; - proxy_pass http://artemis-fe:80; + proxy_pass http://artemis:8080; } } diff --git a/base.yml b/docker-compose.yml similarity index 70% rename from base.yml rename to docker-compose.yml index 78b42c8..8cca05c 100644 --- a/base.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: '3.7' services: nginx: @@ -9,13 +9,18 @@ services: - ./defaults/templates:/etc/nginx/templates - ./defaults/nginx.conf:/etc/nginx/nginx.conf - ./defaults/proxy.conf:/etc/nginx/proxy.conf - - ./.sync:/sync:ro + depends_on: + artemis: + condition: service_started + gitlab: + condition: service_started + jenkins: + condition: service_started ports: - "80:80" networks: - artemis-net - saml: image: jamedjo/test-saml-idp hostname: saml @@ -25,11 +30,13 @@ services: - ./saml/saml20-sp-remote.php:/var/www/simplesamlphp/metadata/saml20-sp-remote.php - ./saml/config.php:/var/www/simplesamlphp/config/config.php networks: - - artemis-net + - artemis-net gitlab: build: context: ./docker/gitlab + args: + GITLAB_VERSION: ${GITLAB_VERSION} restart: unless-stopped volumes: - ./data/gitlab/config:/etc/gitlab @@ -37,7 +44,6 @@ services: - ./data/gitlab/data:/var/opt/gitlab ports: - "${GITLAB_HTTP_PORT}:80" - - "${GITLAB_HTTPS_PORT}:443" - "${GITLAB_SSH_PORT}:22" environment: - GITLAB_OMNIBUS_CONFIG=prometheus_monitoring['enable'] = false; nginx['listen_port'] = 80; gitlab_rails['monitoring_whitelist'] = ['0.0.0.0/0'] @@ -59,24 +65,22 @@ services: networks: - artemis-net - - artemis-be: - build: - context: ./docker/artemis-server - args: - ARTEMIS_VERSION: ${ARTEMIS_VERSION} + artemis: + image: ghcr.io/ls1intum/artemis:${ARTEMIS_VERSION} restart: unless-stopped depends_on: - - artemis-db - - gitlab - - jenkins + artemis-db: + condition: service_started + gitlab: + condition: service_healthy + jenkins: + condition: service_started volumes: - - ./data/artemis-be/config:/opt/Artemis/config - - ./data/artemis-be/data:/opt/Artemis/data - - ./.sync:/opt/Artemis/sync + - ./data/artemis-be/config:/opt/artemis/config + - ./data/artemis-be/data:/opt/artemis/data + - ./branding:/opt/artemis/public/content:ro environment: - - WAIT_FOR="gitlab:80" - - PROFILES=${PROFILES} + - spring.profiles.active=${PROFILES} - SPRING_DATASOURCE_URL=jdbc:mysql://artemis-db:3306/Artemis?createDatabaseIfNotExist=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC networks: - artemis-net @@ -95,24 +99,9 @@ services: cap_add: - SYS_NICE - artemis-fe: - build: - context: ./docker/artemis-client - args: - ARTEMIS_VERSION: ${ARTEMIS_VERSION} - restart: unless-stopped - depends_on: - - artemis-be - volumes: - - ${CUSTOM_PRIVACY_STATEMENT}:/usr/share/nginx/html/public/content/privacy_statement.html:ro - - ${CUSTOM_IMPRINT}:/usr/share/nginx/html/public/content/imprint.html:ro - - ${CUSTOM_ABOUT}:/usr/share/nginx/html/public/content/about-us.json:ro - environment: - - SERVER_NAME=localhost - networks: - - artemis-net - - networks: artemis-net: - + ipam: + driver: default + config: + - subnet: 10.1.0.0/16 diff --git a/docker/artemis-client/Dockerfile.fast b/docker/artemis-client/Dockerfile.fast deleted file mode 100644 index 215544a..0000000 --- a/docker/artemis-client/Dockerfile.fast +++ /dev/null @@ -1,27 +0,0 @@ -ARG DEBIAN_FRONTEND=noninteractive - -FROM nginx - -ARG ARTEMIS_VERSION - -COPY defaults/nginx.conf /etc/nginx/nginx.conf -# See https://hub.docker.com/_/nginx Environment variables -COPY defaults/artemis.conf.template /etc/nginx/templates/artemis.conf.template - -# Extract the Client from the JAR/WAR -RUN apt-get update && apt-get install -y --no-install-recommends unzip wget -RUN wget -O Artemis.zip https://github.com/ls1intum/Artemis/releases/download/$ARTEMIS_VERSION/Artemis.war -RUN unzip Artemis.zip "WEB-INF/classes/static/*" && unzip Artemis.zip "WEB-INF/classes/public/*" -RUN rm -f Artemis.zip - -# Cleanup Client -RUN rm -r WEB-INF/classes/public/images/about WEB-INF/classes/public/content/about-us.json WEB-INF/classes/public/content/imprint.html WEB-INF/classes/public/content/privacy_statement.html -RUN rm -f WEB-INF/classes/static/report.html WEB-INF/classes/static/stats.json - -# Copy Client -RUN mv WEB-INF/classes/public WEB-INF/classes/static/public && mv WEB-INF/classes/static/* /usr/share/nginx/html/ -RUN rm -r WEB-INF - -RUN rm /etc/nginx/conf.d/default.conf - -EXPOSE 80 diff --git a/docker/artemis-client/Dockerfile.manual b/docker/artemis-client/Dockerfile.manual deleted file mode 100644 index 06f42be..0000000 --- a/docker/artemis-client/Dockerfile.manual +++ /dev/null @@ -1,44 +0,0 @@ -ARG DEBIAN_FRONTEND=noninteractive -ARG ARTEMIS_GIT_REPOSITORY=https://github.com/kit-sdq/Artemis -ARG ARTEMIS_VERSION=main - -#################### -# Build stage # -#################### -FROM openjdk:16-jdk-buster AS build - -ENV LC_ALL C - -RUN echo "Installing prerequisites" \ - && apt-get update && apt-get install -y --no-install-recommends curl \ - && curl -sL https://deb.nodesource.com/setup_16.x | bash - \ - && apt-get update && apt-get install -y --no-install-recommends \ - git \ - nodejs \ - rsync - -ARG ARTEMIS_VERSION -ARG ARTEMIS_GIT_REPOSITORY - -RUN echo "Building frontend from $ARTEMIS_GIT_REPOSITORY" \ - && mkdir /build && cd /build \ - && git clone --depth 1 --branch $ARTEMIS_VERSION $ARTEMIS_GIT_REPOSITORY \ - && cd Artemis \ - && npm install \ - && APP_VERSION=$(./gradlew properties -q | grep "^version:" | awk '{print $2}') NODE_OPTIONS="--max_old_space_size=6144" npm run webapp:prod \ - && rm -f build/resources/main/static/stats.json build/resources/main/static/report.html \ - && rsync -a src/main/resources/public/ build/resources/main/static/public/ - -#################### -# Execution stage # -#################### -FROM nginx - -COPY defaults/nginx.conf /etc/nginx/nginx.conf -# See https://hub.docker.com/_/nginx Environment variables -COPY defaults/artemis.conf.template /etc/nginx/templates/artemis.conf.template -COPY --from=build /build/Artemis/build/resources/main/static /usr/share/nginx/html - -RUN rm /etc/nginx/conf.d/default.conf - -EXPOSE 80 diff --git a/docker/artemis-client/defaults/artemis.conf.template b/docker/artemis-client/defaults/artemis.conf.template deleted file mode 100644 index ea7699a..0000000 --- a/docker/artemis-client/defaults/artemis.conf.template +++ /dev/null @@ -1,23 +0,0 @@ -server { - listen 80; - server_name _; - index index.html; - server_name _; - error_log /var/log/nginx/error.log; - server_tokens off; - - root /usr/share/nginx/html; - - # Caching - location ~ /index.html|.*\.json$ { - expires -1; - add_header Cache-Control 'no-store, no-cache, must-revalidate, max-age=0'; - } - location ~ .*\.css$|.*\.js$ { - add_header Cache-Control 'max-age=31449600'; # one year - } - - location / { - try_files $uri $uri/ /index.html; - } -} \ No newline at end of file diff --git a/docker/artemis-client/defaults/nginx.conf b/docker/artemis-client/defaults/nginx.conf deleted file mode 100644 index e4bad8d..0000000 --- a/docker/artemis-client/defaults/nginx.conf +++ /dev/null @@ -1,32 +0,0 @@ - -user nginx; -worker_processes 1; - -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - #tcp_nopush on; - - keepalive_timeout 65; - - #gzip on; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/docker/artemis-server/Dockerfile.fast b/docker/artemis-server/Dockerfile.fast deleted file mode 100644 index 0aa4bd8..0000000 --- a/docker/artemis-server/Dockerfile.fast +++ /dev/null @@ -1,52 +0,0 @@ -ARG DEBIAN_FRONTEND=noninteractive - -FROM openjdk:16-jdk-buster - -ARG ARTEMIS_VERSION -ARG GOSU_VERSION=1.12 -ENV PROFILES=prod,jenkins,gitlab,artemis,scheduling - -RUN echo "Fixing locales" \ - && apt-get update && apt-get install -y --no-install-recommends locales \ - && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ - && locale-gen - -ENV LC_ALL en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US.UTF-8 - -RUN echo "Installing prerequisites" \ - && apt-get update && apt-get install -y --no-install-recommends \ - supervisor \ - netcat \ - graphviz \ - zip \ - && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ - && chmod +x /usr/local/bin/gosu \ - && gosu nobody true - -COPY bootstrap.sh /bootstrap.sh -COPY supervisord.conf /etc/supervisor/supervisord.conf -COPY stop-supervisor.sh /usr/local/sbin/stop-supervisor.sh - -RUN mkdir -p /opt/Artemis/config /opt/Artemis/data /defaults/Artemis -RUN wget -O /opt/Artemis/Artemis.jar https://github.com/ls1intum/Artemis/releases/download/$ARTEMIS_VERSION/Artemis.war - -# Deleting Client from JAR/WAR -RUN zip --delete /opt/Artemis/Artemis.jar "WEB-INF/classes/public*" -RUN zip --delete /opt/Artemis/Artemis.jar "WEB-INF/classes/static*" - -# Extracting default config -RUN unzip /opt/Artemis/Artemis.jar "WEB-INF/classes/config*" -d /defaults/Artemis && mv /defaults/Artemis/WEB-INF/classes/config/* /defaults/Artemis/ && rm -r /defaults/Artemis/WEB-INF - -RUN chmod +x /bootstrap.sh \ - /usr/local/sbin/stop-supervisor.sh \ - /opt/Artemis/Artemis.jar \ - && useradd -ms /bin/bash artemis - -VOLUME ["/opt/Artemis/config"] -VOLUME ["/opt/Artemis/data"] -EXPOSE 8080 - -CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf diff --git a/docker/artemis-server/Dockerfile.manual b/docker/artemis-server/Dockerfile.manual deleted file mode 100644 index 9b36230..0000000 --- a/docker/artemis-server/Dockerfile.manual +++ /dev/null @@ -1,74 +0,0 @@ -ARG DEBIAN_FRONTEND=noninteractive -ARG ARTEMIS_GIT_REPOSITORY=https://github.com/kit-sdq/Artemis -ARG ARTEMIS_VERSION=main - -#################### -# Build stage # -#################### -FROM openjdk:16-jdk-buster AS build - -ENV LC_ALL C - -ARG ARTEMIS_VERSION -ARG ARTEMIS_GIT_REPOSITORY - -# Builds the server without client -# Use ./gradlew -Pprod -Pwar clean bootWar and change .jar to .war -# to run the server with client included. -RUN echo "Building from $ARTEMIS_GIT_REPOSITORY" \ - && mkdir /build && cd /build \ - && git clone --depth 1 --branch $ARTEMIS_VERSION $ARTEMIS_GIT_REPOSITORY \ - && cd Artemis \ - && ./gradlew clean bootWar -Pprod -Pwar -x webapp -x test -x jacocoTestCoverageVerification - -RUN cd /build/Artemis \ - && mv /build/Artemis/build/libs/Artemis-$(./gradlew properties -q | grep "^version:" | awk '{print $2}').war \ - /build/Artemis/build/libs/Artemis.jar - -#################### -# Execution stage # -#################### -FROM openjdk:16-jdk-buster - -ARG ARTEMIS_VERSION -ARG GOSU_VERSION=1.12 -ENV PROFILES=prod,jenkins,gitlab,artemis,scheduling - -RUN echo "Fixing locales" \ - && apt-get update && apt-get install -y --no-install-recommends locales \ - && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ - && locale-gen - -ENV LC_ALL en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US.UTF-8 - -RUN echo "Installing prerequisites" \ - && apt-get update && apt-get install -y --no-install-recommends \ - supervisor \ - netcat \ - graphviz \ - && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ - && chmod +x /usr/local/bin/gosu \ - && gosu nobody true - -COPY bootstrap.sh /bootstrap.sh -COPY supervisord.conf /etc/supervisor/supervisord.conf -COPY stop-supervisor.sh /usr/local/sbin/stop-supervisor.sh - -RUN mkdir -p /opt/Artemis/config /opt/Artemis/data /defaults/Artemis - -COPY --from=build /build/Artemis/build/libs /opt/Artemis -COPY --from=build /build/Artemis/build/resources/main/config /defaults/Artemis - -RUN chmod +x /bootstrap.sh \ - /usr/local/sbin/stop-supervisor.sh \ - /opt/Artemis/Artemis.jar \ - && useradd -ms /bin/bash artemis - -VOLUME ["/opt/Artemis/config"] -VOLUME ["/opt/Artemis/data"] -EXPOSE 8080 - -CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf diff --git a/docker/artemis-server/bootstrap.sh b/docker/artemis-server/bootstrap.sh deleted file mode 100644 index 8626321..0000000 --- a/docker/artemis-server/bootstrap.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -cd /opt/Artemis - -if [ -z "$(ls -A config)" ]; then - echo "Config is Empty .. copying default ones .." - cp -n -a /defaults/Artemis/. config/ -else - echo "Config is not empty .. not copying default configs .." -fi - -# Ensure at least the directories are owned by artemis. -R takes too long -chown artemis:artemis config data sync - -touch sync/waiting-backend - -# Allow waiting for other services -if [ -n "${WAIT_FOR}" ]; then - hosts_ports=$(echo $WAIT_FOR | tr "," "\n" | tr -d "\"") - for host_port in $hosts_ports - do - until [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' http://$host_port)" == "200" ]] - do - echo "Waiting for $host_port" - sleep 5 - done - done -fi - -# Release lock at nginx after 90 seconds -bash -c "sleep 90 && rm -f sync/waiting-backend" & - -echo "Starting application..." -exec gosu artemis java \ - -Djdk.tls.ephemeralDHKeySize=2048 \ - -DLC_CTYPE=UTF-8 \ - -Dfile.encoding=UTF-8 \ - -Dsun.jnu.encoding=UTF-8 \ - -Djava.security.egd=file:/dev/./urandom \ - -Xmx2048m \ - --add-modules java.se \ - --add-exports java.base/jdk.internal.ref=ALL-UNNAMED \ - --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED \ - --add-opens java.base/java.lang=ALL-UNNAMED \ - --add-opens java.base/java.nio=ALL-UNNAMED \ - --add-opens java.base/sun.nio.ch=ALL-UNNAMED \ - --add-opens java.management/sun.management=ALL-UNNAMED \ - --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED \ - -jar Artemis.jar \ - --spring.profiles.active=$PROFILES diff --git a/docker/artemis-server/stop-supervisor.sh b/docker/artemis-server/stop-supervisor.sh deleted file mode 100644 index 5394490..0000000 --- a/docker/artemis-server/stop-supervisor.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -printf "READY\n"; - -while read line; do - echo "Processing Event: $line" >&2; - kill -3 $(cat "/var/run/supervisord.pid") -done < /dev/stdin diff --git a/docker/artemis-server/supervisord.conf b/docker/artemis-server/supervisord.conf deleted file mode 100644 index 76653c9..0000000 --- a/docker/artemis-server/supervisord.conf +++ /dev/null @@ -1,17 +0,0 @@ -[supervisord] -nodaemon=true -user=root - -[program:application] -command=/bootstrap.sh -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -priority=1 -autorestart=true -stopwaitsecs=120 - -[eventlistener:processes] -command=/usr/local/sbin/stop-supervisor.sh -events=PROCESS_STATE_STOPPED, PROCESS_STATE_EXITED, PROCESS_STATE_FATAL diff --git a/docker/gitlab/Dockerfile b/docker/gitlab/Dockerfile index 5f5db65..32ca41b 100644 --- a/docker/gitlab/Dockerfile +++ b/docker/gitlab/Dockerfile @@ -1,3 +1,3 @@ -FROM gitlab/gitlab-ce:14.1.2-ce.0 - +ARG GITLAB_VERSION +FROM gitlab/gitlab-ce:${GITLAB_VERSION} RUN sed -i '/^.*user_params\[:password_expires_at\] = Time.current if admin_making_changes_for_another_user.*$/s/^/#/' /opt/gitlab/embedded/service/gitlab-rails/lib/api/users.rb diff --git a/fast-build.yml b/fast-build.yml deleted file mode 100644 index 6a1694d..0000000 --- a/fast-build.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: '3' - -services: - artemis-be: - build: - dockerfile: Dockerfile.fast - - artemis-fe: - build: - dockerfile: Dockerfile.fast diff --git a/manual-build.yml b/manual-build.yml deleted file mode 100644 index 493ba56..0000000 --- a/manual-build.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: '3' - -services: - artemis-be: - build: - dockerfile: Dockerfile.manual - args: - ARTEMIS_GIT_REPOSITORY: ${ARTEMIS_GIT_REPOSITORY} - - - artemis-fe: - build: - dockerfile: Dockerfile.manual - args: - ARTEMIS_GIT_REPOSITORY: ${ARTEMIS_GIT_REPOSITORY}