From 02cffb6513a2282542c4e912e9fdc338cb57e743 Mon Sep 17 00:00:00 2001 From: VibroAxe Date: Tue, 20 Jul 2021 12:30:05 +0000 Subject: [PATCH 1/4] Rebase generic off monolithic -----DO NOT MERGE UNTIL UPDATING DOCKERFILE TO LATEST------ This commit rebases the generic code off the monolithic image This allows the base image to be the more regularly accessed / edited image removing the minor map changes directly in this generic image Commits to lancachenet/monolithic:switcheroo will mimic this commit Also fixes lancachenet/generic#108 --- Dockerfile | 21 ++------- goss.yaml | 2 +- .../etc/nginx/conf.d/20_proxy_cache_path.conf | 1 - overlay/etc/nginx/conf.d/30_maps.conf | 1 + overlay/etc/nginx/nginx.conf | 39 ---------------- .../etc/nginx/sites-available/10_generic.conf | 10 ---- .../root/30_cache_key.conf | 0 .../generic.conf.d/10_generic.conf | 19 -------- .../generic.conf.d/20_arenanet_manifest.conf | 6 --- .../generic.conf.d/20_wsus_cabs.conf | 6 --- .../root/10_loop_detection.conf | 7 --- .../generic.conf.d/root/20_cache.conf | 30 ------------ .../generic.conf.d/root/40_etags.conf | 3 -- .../generic.conf.d/root/90_upstream.conf | 10 ---- .../generic.conf.d/root/99_debug_header.conf | 4 -- .../etc/nginx/stream-available/10_sni.conf | 9 ---- overlay/etc/nginx/workers.conf | 1 - overlay/etc/supervisor/conf.d/heartbeat.conf | 4 -- .../hooks/entrypoint-pre.d/05_config_check.sh | 46 ------------------- overlay/hooks/entrypoint-pre.d/10_setup.sh | 14 ------ .../entrypoint-pre.d/15_generate_maps.sh | 3 ++ .../hooks/entrypoint-pre.d/20_perms_check.sh | 14 ------ .../supervisord-pre.d/99_config_check.sh | 9 ---- overlay/scripts/cache_test.sh | 28 ++++++++--- 24 files changed, 32 insertions(+), 255 deletions(-) delete mode 100644 overlay/etc/nginx/conf.d/20_proxy_cache_path.conf create mode 100644 overlay/etc/nginx/conf.d/30_maps.conf delete mode 100644 overlay/etc/nginx/nginx.conf delete mode 100644 overlay/etc/nginx/sites-available/10_generic.conf rename overlay/etc/nginx/sites-available/{generic.conf.d => cache.conf.d}/root/30_cache_key.conf (100%) delete mode 100644 overlay/etc/nginx/sites-available/generic.conf.d/10_generic.conf delete mode 100644 overlay/etc/nginx/sites-available/generic.conf.d/20_arenanet_manifest.conf delete mode 100644 overlay/etc/nginx/sites-available/generic.conf.d/20_wsus_cabs.conf delete mode 100644 overlay/etc/nginx/sites-available/generic.conf.d/root/10_loop_detection.conf delete mode 100644 overlay/etc/nginx/sites-available/generic.conf.d/root/20_cache.conf delete mode 100644 overlay/etc/nginx/sites-available/generic.conf.d/root/40_etags.conf delete mode 100644 overlay/etc/nginx/sites-available/generic.conf.d/root/90_upstream.conf delete mode 100644 overlay/etc/nginx/sites-available/generic.conf.d/root/99_debug_header.conf delete mode 100644 overlay/etc/nginx/stream-available/10_sni.conf delete mode 100644 overlay/etc/nginx/workers.conf delete mode 100644 overlay/etc/supervisor/conf.d/heartbeat.conf delete mode 100644 overlay/hooks/entrypoint-pre.d/05_config_check.sh delete mode 100644 overlay/hooks/entrypoint-pre.d/10_setup.sh create mode 100644 overlay/hooks/entrypoint-pre.d/15_generate_maps.sh delete mode 100644 overlay/hooks/entrypoint-pre.d/20_perms_check.sh delete mode 100644 overlay/hooks/supervisord-pre.d/99_config_check.sh diff --git a/Dockerfile b/Dockerfile index a982c50..26ff22a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ -FROM lancachenet/ubuntu-nginx:latest -MAINTAINER LanCache.Net Team +FROM lancachenet/monolithic:switcheroo +LABEL version=3 +LABEL description="Single agressive caching container for caching game content at lan parties." +LABEL maintainer=" LanCache.Net Team " ENV GENERICCACHE_VERSION=2 \ - WEBUSER=www-data \ CACHE_MODE=generic \ CACHE_MEM_SIZE=500m \ CACHE_DISK_SIZE=1000000m \ @@ -15,19 +16,7 @@ ENV GENERICCACHE_VERSION=2 \ COPY overlay/ / -RUN rm /etc/nginx/sites-enabled/* /etc/nginx/stream-enabled/* ;\ - rm /etc/nginx/conf.d/gzip.conf ;\ - chmod 754 /var/log/tallylog ; \ - id -u ${WEBUSER} &> /dev/null || adduser --system --home /var/www/ --no-create-home --shell /bin/false --group --disabled-login ${WEBUSER} ;\ - chmod 755 /scripts/* ;\ - mkdir -m 755 -p /data/cache ;\ - mkdir -m 755 -p /data/info ;\ - mkdir -m 755 -p /data/logs ;\ - mkdir -m 755 -p /tmp/nginx/ ;\ - chown -R ${WEBUSER}:${WEBUSER} /data/ ;\ - mkdir -p /etc/nginx/sites-enabled ;\ - ln -s /etc/nginx/sites-available/10_generic.conf /etc/nginx/sites-enabled/10_generic.conf; \ - ln -s /etc/nginx/stream-available/10_sni.conf /etc/nginx/stream-enabled/10_sni.conf +RUN rm -rf /data/cachedomains/* VOLUME ["/data/logs", "/data/cache", "/var/www"] diff --git a/goss.yaml b/goss.yaml index a62b888..54e5354 100644 --- a/goss.yaml +++ b/goss.yaml @@ -13,7 +13,7 @@ command: exit-status: 0 stdout: - Succesfully Cached - timeout: 10000 + timeout: 20000 process: nginx: running: true diff --git a/overlay/etc/nginx/conf.d/20_proxy_cache_path.conf b/overlay/etc/nginx/conf.d/20_proxy_cache_path.conf deleted file mode 100644 index 8b43a8f..0000000 --- a/overlay/etc/nginx/conf.d/20_proxy_cache_path.conf +++ /dev/null @@ -1 +0,0 @@ -proxy_cache_path /data/cache/cache levels=2:2 keys_zone=generic:CACHE_MEM_SIZE inactive=200d max_size=CACHE_DISK_SIZE loader_files=1000 loader_sleep=50ms loader_threshold=300ms use_temp_path=off; diff --git a/overlay/etc/nginx/conf.d/30_maps.conf b/overlay/etc/nginx/conf.d/30_maps.conf new file mode 100644 index 0000000..bad9358 --- /dev/null +++ b/overlay/etc/nginx/conf.d/30_maps.conf @@ -0,0 +1 @@ +#no maps needed in generic \ No newline at end of file diff --git a/overlay/etc/nginx/nginx.conf b/overlay/etc/nginx/nginx.conf deleted file mode 100644 index 367a734..0000000 --- a/overlay/etc/nginx/nginx.conf +++ /dev/null @@ -1,39 +0,0 @@ -user www-data; -include /etc/nginx/workers.conf; -pid /run/nginx.pid; - -include /etc/nginx/modules-enabled/*.conf; - -events { - worker_connections 4096; - multi_accept on; - use epoll; -} - -http { - aio threads; - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - access_log /var/log/nginx/access.log; - error_log /var/log/nginx/error.log; - - - gzip on; - - include /etc/nginx/conf.d/*.conf; - - include /etc/nginx/sites-enabled/*.conf; -} - - -stream { - include /etc/nginx/stream.d/*.conf; - include /etc/nginx/stream-enabled/*; -} diff --git a/overlay/etc/nginx/sites-available/10_generic.conf b/overlay/etc/nginx/sites-available/10_generic.conf deleted file mode 100644 index 7349480..0000000 --- a/overlay/etc/nginx/sites-available/10_generic.conf +++ /dev/null @@ -1,10 +0,0 @@ - -server { - listen 80 reuseport; - - access_log /data/logs/access.log cachelog; - error_log /data/logs/error.log; - - - include /etc/nginx/sites-available/generic.conf.d/*.conf; -} diff --git a/overlay/etc/nginx/sites-available/generic.conf.d/root/30_cache_key.conf b/overlay/etc/nginx/sites-available/cache.conf.d/root/30_cache_key.conf similarity index 100% rename from overlay/etc/nginx/sites-available/generic.conf.d/root/30_cache_key.conf rename to overlay/etc/nginx/sites-available/cache.conf.d/root/30_cache_key.conf diff --git a/overlay/etc/nginx/sites-available/generic.conf.d/10_generic.conf b/overlay/etc/nginx/sites-available/generic.conf.d/10_generic.conf deleted file mode 100644 index 92c43ba..0000000 --- a/overlay/etc/nginx/sites-available/generic.conf.d/10_generic.conf +++ /dev/null @@ -1,19 +0,0 @@ - resolver UPSTREAM_DNS ipv6=off; - - location / { - - include /etc/nginx/sites-available/generic.conf.d/root/*.conf; - - } - - # Fix for League of Legends Updater - location ~ ^.+(releaselisting_.*|.version$) { - proxy_pass http://$host; - } - - location = /lancache-heartbeat { - add_header X-LanCache-Processed-By $hostname; - add_header 'Access-Control-Expose-Headers' '*'; - add_header 'Access-Control-Allow-Origin' '*'; - return 204; - } diff --git a/overlay/etc/nginx/sites-available/generic.conf.d/20_arenanet_manifest.conf b/overlay/etc/nginx/sites-available/generic.conf.d/20_arenanet_manifest.conf deleted file mode 100644 index 509d614..0000000 --- a/overlay/etc/nginx/sites-available/generic.conf.d/20_arenanet_manifest.conf +++ /dev/null @@ -1,6 +0,0 @@ - # Fix for GW2 manifest - location ^~ /latest64 { - proxy_cache_bypass 1; - proxy_no_cache 1; - proxy_pass http://$host$request_uri; - } diff --git a/overlay/etc/nginx/sites-available/generic.conf.d/20_wsus_cabs.conf b/overlay/etc/nginx/sites-available/generic.conf.d/20_wsus_cabs.conf deleted file mode 100644 index 4af9591..0000000 --- a/overlay/etc/nginx/sites-available/generic.conf.d/20_wsus_cabs.conf +++ /dev/null @@ -1,6 +0,0 @@ - # Fix for WSUS authroot cab files - location ~* (authrootstl.cab|pinrulesstl.cab|disallowedcertstl.cab)$ { - proxy_cache_bypass 1; - proxy_no_cache 1; - proxy_pass http://$host$request_uri; - } diff --git a/overlay/etc/nginx/sites-available/generic.conf.d/root/10_loop_detection.conf b/overlay/etc/nginx/sites-available/generic.conf.d/root/10_loop_detection.conf deleted file mode 100644 index 067989c..0000000 --- a/overlay/etc/nginx/sites-available/generic.conf.d/root/10_loop_detection.conf +++ /dev/null @@ -1,7 +0,0 @@ - # Abort any circular requests - if ($http_X_LanCache_Processed_By = $hostname) { - return 508; - } - - proxy_set_header X-LanCache-Processed-By $hostname; - add_header X-LanCache-Processed-By $hostname,$http_X_LanCache_Processed_By; diff --git a/overlay/etc/nginx/sites-available/generic.conf.d/root/20_cache.conf b/overlay/etc/nginx/sites-available/generic.conf.d/root/20_cache.conf deleted file mode 100644 index 294a6a4..0000000 --- a/overlay/etc/nginx/sites-available/generic.conf.d/root/20_cache.conf +++ /dev/null @@ -1,30 +0,0 @@ - # Cache Location - slice 1m; - proxy_cache generic; - - proxy_ignore_headers Expires Cache-Control; - proxy_cache_valid 200 206 CACHE_MAX_AGE; - proxy_set_header Range $slice_range; - - # Only download one copy at a time and use a large timeout so - # this really happens, otherwise we end up wasting bandwith - # getting the file multiple times. - proxy_cache_lock on; - proxy_cache_lock_timeout 1h; - - # Allow the use of state entries - proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504; - - # Allow caching of 200 but not 301 or 302 as our cache key may not include query params - # hence may not be valid for all users - proxy_cache_valid 301 302 0; - - # Enable cache revalidation - proxy_cache_revalidate on; - - # Don't cache requests marked as nocache=1 - proxy_cache_bypass $arg_nocache; - - # 40G max file - proxy_max_temp_file_size 40960m; - diff --git a/overlay/etc/nginx/sites-available/generic.conf.d/root/40_etags.conf b/overlay/etc/nginx/sites-available/generic.conf.d/root/40_etags.conf deleted file mode 100644 index a6d85c9..0000000 --- a/overlay/etc/nginx/sites-available/generic.conf.d/root/40_etags.conf +++ /dev/null @@ -1,3 +0,0 @@ - # Battle.net Fix - proxy_hide_header ETag; - diff --git a/overlay/etc/nginx/sites-available/generic.conf.d/root/90_upstream.conf b/overlay/etc/nginx/sites-available/generic.conf.d/root/90_upstream.conf deleted file mode 100644 index a42a604..0000000 --- a/overlay/etc/nginx/sites-available/generic.conf.d/root/90_upstream.conf +++ /dev/null @@ -1,10 +0,0 @@ - # Upstream Configuration - proxy_next_upstream error timeout http_404; - proxy_pass http://$host$request_uri; - proxy_redirect off; - proxy_ignore_client_abort on; - - # Upstream request headers - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/overlay/etc/nginx/sites-available/generic.conf.d/root/99_debug_header.conf b/overlay/etc/nginx/sites-available/generic.conf.d/root/99_debug_header.conf deleted file mode 100644 index 694746f..0000000 --- a/overlay/etc/nginx/sites-available/generic.conf.d/root/99_debug_header.conf +++ /dev/null @@ -1,4 +0,0 @@ - # Debug Headers - add_header X-Upstream-Status $upstream_status; - add_header X-Upstream-Response-Time $upstream_response_time; - add_header X-Upstream-Cache-Status $upstream_cache_status; diff --git a/overlay/etc/nginx/stream-available/10_sni.conf b/overlay/etc/nginx/stream-available/10_sni.conf deleted file mode 100644 index aa28f67..0000000 --- a/overlay/etc/nginx/stream-available/10_sni.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 443; - resolver UPSTREAM_DNS ipv6=off; - proxy_pass $ssl_preread_server_name:443; - ssl_preread on; - - access_log /data/logs/stream-access.log stream_basic; - error_log /data/logs/stream-error.log; -} diff --git a/overlay/etc/nginx/workers.conf b/overlay/etc/nginx/workers.conf deleted file mode 100644 index 94e152f..0000000 --- a/overlay/etc/nginx/workers.conf +++ /dev/null @@ -1 +0,0 @@ -worker_processes 16; diff --git a/overlay/etc/supervisor/conf.d/heartbeat.conf b/overlay/etc/supervisor/conf.d/heartbeat.conf deleted file mode 100644 index 004cab3..0000000 --- a/overlay/etc/supervisor/conf.d/heartbeat.conf +++ /dev/null @@ -1,4 +0,0 @@ -[program:heartbeat] -command=/scripts/heartbeat.sh -stdout_events_enabled=true -stderr_events_enabled=true diff --git a/overlay/hooks/entrypoint-pre.d/05_config_check.sh b/overlay/hooks/entrypoint-pre.d/05_config_check.sh deleted file mode 100644 index b9084a1..0000000 --- a/overlay/hooks/entrypoint-pre.d/05_config_check.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -echo "Checking cache configuration" - - -print_confighash_warning () { - echo "" - echo "ABORTING STARTUP TO AVOID POTENTIALLY INVALIDATING THE CACHE" - echo "" - echo "If you are happy that this cache is valid with the current config changes" - echo "please delete \`//CONFIGHASH\`" - echo "" - echo "See: https://lancache.net/docs/advanced/config-hash/ for more details" - -} - -DETECTED_CACHE_KEY=`grep proxy_cache_key /etc/nginx/sites-available/generic.conf.d/root/30_cache_key.conf | awk '{print $2}'` -NEWHASH="GENERICCACHE_VERSION=${GENERICCACHE_VERSION};CACHE_MODE=${CACHE_MODE};CACHE_SLICE_SIZE=${CACHE_SLICE_SIZE};CACHE_KEY=${DETECTED_CACHE_KEY}" - -if [ -d /data/cache/cache ]; then - echo " Detected existing cache data, checking config hash for consistency" - if [ -f /data/cache/CONFIGHASH ]; then - OLDHASH=`cat /data/cache/CONFIGHASH` - if [ ${OLDHASH} != ${NEWHASH} ]; then - echo "ERROR: Detected CONFIGHASH does not match current CONFIGHASH" - echo " Detected: ${OLDHASH}" - echo " Current: ${NEWHASH}" - print_confighash_warning ${NEWHASH} - exit -1; - else - echo " CONFIGHASH matches current configuration" - fi - else - echo " Could not find CONFIGHASH for existing cachedata" - echo " This is either an upgrade from an older instance of Lancache" - echo " or CONFIGHASH has been deleted intentionally" - echo "" - echo " Creating CONFIGHASH from current live configuration" - echo " Current: ${NEWHASH}" - echo "" - echo " See: https://lancache.net/docs/advanced/config-hash/ for more details" - fi -fi - -mkdir -p /data/cache/cache -echo ${NEWHASH} > /data/cache/CONFIGHASH diff --git a/overlay/hooks/entrypoint-pre.d/10_setup.sh b/overlay/hooks/entrypoint-pre.d/10_setup.sh deleted file mode 100644 index 486d1cb..0000000 --- a/overlay/hooks/entrypoint-pre.d/10_setup.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -set -e - -# Preprocess UPSTREAM_DNS to allow for multiple resolvers using the same syntax as lancache-dns -UPSTREAM_DNS="$(echo -n "${UPSTREAM_DNS}" | sed 's/[;]/ /g')" - -echo "worker_processes ${NGINX_WORKER_PROCESSES};" > /etc/nginx/workers.conf -sed -i "s/^user .*/user ${WEBUSER};/" /etc/nginx/nginx.conf -sed -i "s/CACHE_MEM_SIZE/${CACHE_MEM_SIZE}/" /etc/nginx/conf.d/20_proxy_cache_path.conf -sed -i "s/CACHE_DISK_SIZE/${CACHE_DISK_SIZE}/" /etc/nginx/conf.d/20_proxy_cache_path.conf -sed -i "s/CACHE_MAX_AGE/${CACHE_MAX_AGE}/" /etc/nginx/sites-available/generic.conf.d/root/20_cache.conf -sed -i "s/slice 1m;/slice ${CACHE_SLICE_SIZE};/" /etc/nginx/sites-available/generic.conf.d/root/20_cache.conf -sed -i "s/UPSTREAM_DNS/${UPSTREAM_DNS}/" /etc/nginx/sites-available/generic.conf.d/10_generic.conf -sed -i "s/UPSTREAM_DNS/${UPSTREAM_DNS}/" /etc/nginx/stream-available/10_sni.conf diff --git a/overlay/hooks/entrypoint-pre.d/15_generate_maps.sh b/overlay/hooks/entrypoint-pre.d/15_generate_maps.sh new file mode 100644 index 0000000..82f8751 --- /dev/null +++ b/overlay/hooks/entrypoint-pre.d/15_generate_maps.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +# no maps needed \ No newline at end of file diff --git a/overlay/hooks/entrypoint-pre.d/20_perms_check.sh b/overlay/hooks/entrypoint-pre.d/20_perms_check.sh deleted file mode 100644 index b686cde..0000000 --- a/overlay/hooks/entrypoint-pre.d/20_perms_check.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -if [ -d "/data/cache/cache" ]; then - echo "Running fast permissions check" - ls -l /data/cache/cache | tail --lines=+2 | grep -v ${WEBUSER} > /dev/null - - if [[ $? -eq 0 || "$FORCE_PERMS_CHECK" == "true" ]]; then - echo "Doing full checking of permissions (This WILL take a long time on large caches)..." - find /data \! -user ${WEBUSER} -exec chown ${WEBUSER}:${WEBUSER} '{}' + - echo "Permissions ok" - else - echo "Fast permissions check successful, if you have any permissions error try running with -e FORCE_PERMS_CHECK = true" - fi - -fi diff --git a/overlay/hooks/supervisord-pre.d/99_config_check.sh b/overlay/hooks/supervisord-pre.d/99_config_check.sh deleted file mode 100644 index b83bd7d..0000000 --- a/overlay/hooks/supervisord-pre.d/99_config_check.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -set -e -echo "Currently configured config:" -/scripts/getconfig.sh /etc/nginx/nginx.conf - -echo "Checking nginx config" -/usr/sbin/nginx -t - - [ $? -ne 0 ] || echo "Config check successful" diff --git a/overlay/scripts/cache_test.sh b/overlay/scripts/cache_test.sh index d55a7e6..01b99c2 100755 --- a/overlay/scripts/cache_test.sh +++ b/overlay/scripts/cache_test.sh @@ -1,13 +1,29 @@ #!/bin/bash set -e -pageload1=`curl http://www.lagado.com/tools/cache-test --resolve www.lagado.com:80:127.0.0.1` +pageload1=`curl http://www.worldtimeapi.org/api/timezone/ETC/GMT --resolve www.worldtimeapi.org:80:127.0.0.1` sleep 5 -pageload2=`curl http://www.lagado.com/tools/cache-test --resolve www.lagado.com:80:127.0.0.1` - +pageload2=`curl http://www.worldtimeapi.org/api/timezone/ETC/GMT --resolve www.worldtimeapi.org:80:127.0.0.1` +sleep 5 +pageload3=`curl http://worldtimeapi.org/api/timezone/ETC/GMT --resolve worldtimeapi.org:80:127.0.0.1` +sleep 5 +pageload4=`curl http://worldtimeapi.org/api/timezone/ETC/GMT --resolve worldtimeapi.org:80:127.0.0.1` if [ "$pageload1" == "$pageload2" ]; then - echo "Succesfully Cached" - exit 0 + if [ "$pageload3" == "$pageload4" ]; then + if [ "$pageload1" == "$pageload4" ]; then + echo "Succesfully Cached" + exit 0 + else + #In generic pages 1+4 should be identical as all domains are cached equally + echo "Error caching test page, pages 1+4 are different" + exit -3 + fi + + else + echo "Error caching test page, pages 3+4 different" + exit -2 + fi + else - echo "Error caching test page, pages differed" + echo "Error caching test page, pages 1+2 different" exit -1 fi From 5f0e9cc09693b63e808f216f6b612e0a058b91b0 Mon Sep 17 00:00:00 2001 From: James Kinsman Date: Sat, 9 Oct 2021 12:58:43 +0100 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: GotenXiao --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 26ff22a..c220531 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM lancachenet/monolithic:switcheroo LABEL version=3 -LABEL description="Single agressive caching container for caching game content at lan parties." -LABEL maintainer=" LanCache.Net Team " +LABEL description="Single aggressive caching container for caching game content at LAN parties." +LABEL maintainer="LanCache.Net Team " ENV GENERICCACHE_VERSION=2 \ CACHE_MODE=generic \ From 6de9c3630727c31849549e300bd267648f05a56f Mon Sep 17 00:00:00 2001 From: James Kinsman Date: Sat, 9 Oct 2021 13:00:49 +0100 Subject: [PATCH 3/4] Update config.yml Disable build children as no dependencies --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f39b4bf..7b39930 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,7 +78,7 @@ jobs: - run: name: "Request API to build children" command: | - for child in {"monolithic"}; do - echo "Asking API to trigger build for $child" - curl -X POST --header "Content-Type: application/json" -d '{"branch":"master"}' https://circleci.com/api/v1.1/project/github/lancachenet/$child/build?circle-token=${CIRCLE_API_USER_TOKEN} - done + #for child in {"monolithic"}; do + # echo "Asking API to trigger build for $child" + # curl -X POST --header "Content-Type: application/json" -d '{"branch":"master"}' https://circleci.com/api/v1.1/project/github/lancachenet/$child/build?circle-token=${CIRCLE_API_USER_TOKEN} + #done From e8b5e080f23f32f0d3c2fd41de7ad8ef0d7cb488 Mon Sep 17 00:00:00 2001 From: James Kinsman Date: Sat, 9 Oct 2021 13:02:38 +0100 Subject: [PATCH 4/4] Update Dockerfile Rebase from monolithic:latest ready for final merge --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c220531..28d2e82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lancachenet/monolithic:switcheroo +FROM lancachenet/monolithic:latest LABEL version=3 LABEL description="Single aggressive caching container for caching game content at LAN parties." LABEL maintainer="LanCache.Net Team "