From 1b1cfe9317ca1fe23f2ae1c03b5c99c9232ef3a8 Mon Sep 17 00:00:00 2001 From: Simon C Date: Thu, 21 May 2020 17:54:59 +0200 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20avec=20la=20nouvelle=20i?= =?UTF-8?q?nfra=20weko?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 4 ++++ .drone.yml | 20 ++++++++++---------- .gitmodules | 2 +- Dockerfile | 2 +- docker-compose.yml | 6 +++--- run | 4 ++-- 6 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..f205c0b --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +# Ignore everything +** + +!public diff --git a/.drone.yml b/.drone.yml index b20edcd..7e59df1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,20 +1,20 @@ --- -# drone encrypt lowtech/lowtechweb $REGISTRY_PASSWORD +# drone encrypt lowtechweb/lowtechweb $REGISTRY_PASSWORD kind: secret name: REGISTRY_PASSWORD -data: PcAbh064ltmdAbnvm9q8R8Rx2c6nN3csix0zlPOHslgjXgs/Oih03slIaIl7dmvSYtHTTbxKKk6Mx9DFUQdH+qXGtWXagorLa2ZMR9wt +data: A0DZ8iVYjD2XuzM2PtVOYPVCTguvfdEiKi5WmoUXK+CXYCPLLhGoLvYQ2s461IZgjl8wYWG8/6dUxPZSAHwH3j+dfPOzV6doMVKSXnfs --- -# drone encrypt lowtech/lowtechweb $REGISTRY_USER +# drone encrypt lowtechweb/lowtechweb $REGISTRY_USER kind: secret name: REGISTRY_USER -data: y5RMoikR/kNvfnbVRaUMBQNSW53bg7QEEqb/vWrV/2JoVw== +data: u5v7yp2Vs4wlGQJDgNacH7YMqDZrJOCvUZb+JC2BZCiGuQ== --- -# drone encrypt lowtech/lowtechweb "{\"auths\":{\"https://registry.lamelio.fr\":{\"auth\":\"$(echo -n "$REGISTRY_USER:$REGISTRY_PASSWORD" | base64)\",\"email\":\"$REGISTRY_USER\"}}}" +# drone encrypt lowtechweb/lowtechweb "{\"auths\":{\"https://registry.weko.io\":{\"auth\":\"$(echo -n "$REGISTRY_USER:$REGISTRY_PASSWORD" | base64)\",\"email\":\"$REGISTRY_USER\"}}}" kind: secret name: REGISTRY_CONFIG -data: YBvxqLCtXGt2lweeODMwEJe9x8Bn+ZH5tYnEdGPADxSUbl2EtOyjVJbudHQ1oiztIEKOJhG5e5PTp7kgnp5rqTndjQSFb9EIdFRD+VV5qzeBlBBeW3PL+j1e15FPUocptEBI6jmLeuXFlWuaOmHnfbOoQsSoD7eakde6U+Tps+NvHU/37kl05v2O+30IxhcPeIIk2RvaBnNP+K7Nb0XZqKMmPNmJ3Qu/SijJkqRq +data: yulyvyCbBlvOoDgDlGL48wpAMNDr7/XwW2kPiOzFuXubzkcX8tjqQUT2I0Jnzm9ZxhUK5Yj0a510wxQHfSx4fT3pHRq/1rXl/c9VNfxaFZcWn8Dcn54MHo3lOOGbS3bAULTiftClsVmW6TglRtjwisLM4uc65EmQvMc/BTSsfJ8Q/12cbz8kUVVIOvIn/0Q4BQ1q2fFfcfEh2P4bwFYLvOf99q58rQXFP8Nk --- kind: pipeline @@ -23,11 +23,11 @@ name: default platform: os: linux - arch: arm + arch: arm64 steps: - name: build - image: registry.lamelio.fr/hugo + image: registry.weko.io/hugo commands: - ./run install - ./run build staging @@ -42,8 +42,8 @@ steps: from_secret: REGISTRY_USER password: from_secret: REGISTRY_PASSWORD - repo: registry.lamelio.fr/lowtechweb - registry: registry.lamelio.fr + repo: registry.weko.io/lowtechweb + registry: registry.weko.io auto_tag: true tags: - latest diff --git a/.gitmodules b/.gitmodules index 2f4ba12..b426a68 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "themes/hugo-theme-lowtech"] path = themes/hugo-theme-lowtech - url = https://gitea.lamelio.fr/kosssi/hugo-theme-lowtech.git + url = https://git.weko.io/kosssi/hugo-theme-lowtech.git diff --git a/Dockerfile b/Dockerfile index 55977d1..be58b6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.lamelio.fr/nginx-lowtech:0.0.5 +FROM registry.weko.io/nginx-lowtech:0.0.5 # Copie des sources du site COPY public /usr/share/nginx/html diff --git a/docker-compose.yml b/docker-compose.yml index e3979cf..0f20080 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ volumes: services: lowtechweb-autopush: container_name: lowtechweb-autopush - image: registry.lamelio.fr/autopush + image: registry.weko.io/autopush restart: always depends_on: - lowtechweb @@ -24,7 +24,7 @@ services: lowtechweb-logs: container_name: lowtechweb-logs - image: registry.lamelio.fr/goaccess + image: registry.weko.io/goaccess restart: always depends_on: - lowtechweb-autopush @@ -36,7 +36,7 @@ services: lowtechweb: container_name: ${NAME} - image: registry.lamelio.fr/lowtechweb + image: registry.weko.io/lowtechweb restart: always environment: - TZ=${TIMEZONE} diff --git a/run b/run index fab3209..5c69ab4 100755 --- a/run +++ b/run @@ -77,8 +77,8 @@ if [ $# -ge 1 ]; then echo "🐳 Création de l'image Docker" echo docker build . -t kosssi/$PROJECT - docker tag kosssi/$PROJECT registry.lamelio.fr/$PROJECT - docker push registry.lamelio.fr/$PROJECT + docker tag kosssi/$PROJECT registry.weko.io/$PROJECT + docker push registry.weko.io/$PROJECT elif [ $1 == "deploy" ]; then echo "🚀 Déploiement avec docker-compose" echo