From 577208281246b024bf02967105ee95524adfb231 Mon Sep 17 00:00:00 2001 From: nataliagranato Date: Sat, 24 Aug 2024 18:21:24 -0300 Subject: [PATCH] =?UTF-8?q?chore:=20Atualizar=20contexto=20e=20arquivo=20D?= =?UTF-8?q?ockerfile=20para=20os=20servi=C3=A7os=20Giropops=20Senhas=20e?= =?UTF-8?q?=20Redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/giropops-docker.yml | 4 ++-- .github/workflows/redis-docker.yml | 4 ++-- manifests/giropops-senhas-deployment.yaml | 2 +- manifests/redis-deployment.yaml | 2 +- .dockerignore => redis/.dockerignore | 20 +++++++++--------- Dockerfile.redis => redis/Dockerfile.redis | 0 redis.conf => redis/redis.conf | 0 src/.dockerignore | 15 +++++++++++++ Dockerfile => src/Dockerfile | 0 app.py => src/app.py | 0 requirements.txt => src/requirements.txt | 0 {static => src/static}/.dockerignore | 0 {static => src/static}/css/output.css | 0 {static => src/static}/css/styles.css | 0 {static => src/static}/js/main.js | 0 {static => src/static}/linuxtips-logo.png | Bin tailwind.config.js => src/tailwind.config.js | 0 {templates => src/templates}/index.html | 0 .../templates}/lista_senhas.html | 0 19 files changed, 31 insertions(+), 16 deletions(-) rename .dockerignore => redis/.dockerignore (52%) rename Dockerfile.redis => redis/Dockerfile.redis (100%) rename redis.conf => redis/redis.conf (100%) create mode 100644 src/.dockerignore rename Dockerfile => src/Dockerfile (100%) rename app.py => src/app.py (100%) rename requirements.txt => src/requirements.txt (100%) rename {static => src/static}/.dockerignore (100%) rename {static => src/static}/css/output.css (100%) rename {static => src/static}/css/styles.css (100%) rename {static => src/static}/js/main.js (100%) rename {static => src/static}/linuxtips-logo.png (100%) rename tailwind.config.js => src/tailwind.config.js (100%) rename {templates => src/templates}/index.html (100%) rename {templates => src/templates}/lista_senhas.html (100%) diff --git a/.github/workflows/giropops-docker.yml b/.github/workflows/giropops-docker.yml index c7c6bd4..e8959e0 100644 --- a/.github/workflows/giropops-docker.yml +++ b/.github/workflows/giropops-docker.yml @@ -52,8 +52,8 @@ jobs: uses: docker/build-push-action@v6 id: build-and-push with: - context: ./ - file: ./Dockerfile + context: ./src + file: ./src/Dockerfile push: true tags: nataliagranato/linuxtips-giropops-senhas:${{ steps.generate-tag.outputs.tag }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/redis-docker.yml b/.github/workflows/redis-docker.yml index 91b1f63..de2d2a9 100644 --- a/.github/workflows/redis-docker.yml +++ b/.github/workflows/redis-docker.yml @@ -52,8 +52,8 @@ jobs: uses: docker/build-push-action@v6 id: build-and-push with: - context: ./ - file: ./Dockerfile + context: ./redis + file: ./redis/Dockerfile.redis push: true tags: nataliagranato/redis:${{ steps.generate-tag.outputs.tag }} labels: ${{ steps.meta.outputs.labels }} diff --git a/manifests/giropops-senhas-deployment.yaml b/manifests/giropops-senhas-deployment.yaml index fdb6064..79c16f3 100644 --- a/manifests/giropops-senhas-deployment.yaml +++ b/manifests/giropops-senhas-deployment.yaml @@ -31,7 +31,7 @@ spec: requests: cpu: '0.1' memory: 128Mi - imagePullPolicy: ifNotPresent + imagePullPolicy: IfNotPresent env: - name: REDIS_HOST value: redis-service diff --git a/manifests/redis-deployment.yaml b/manifests/redis-deployment.yaml index 1f36603..f6c4490 100644 --- a/manifests/redis-deployment.yaml +++ b/manifests/redis-deployment.yaml @@ -16,7 +16,7 @@ spec: app: redis spec: containers: - - image: nataliagranato/redis:e6ed8-20240824202500 + - image: nataliagranato/redis:84b04-20240824205221 name: redis ports: - containerPort: 6379 diff --git a/.dockerignore b/redis/.dockerignore similarity index 52% rename from .dockerignore rename to redis/.dockerignore index e491560..b279e58 100644 --- a/.dockerignore +++ b/redis/.dockerignore @@ -1,15 +1,15 @@ -README.md -OWNERS .github/ -docs/ +chainguard/ +charts/ kind/ +kyverno/ +locust/ manifests/ -screenshots/ scripts/ +src/ +screenshots/ LICENSE -Makefile -kyverno/ -Dockerfile -Dockerfile.redis -docker-compose.yml -chainguard/ \ No newline at end of file +OWNERS +.coderabbit.yaml +README.md +docker-compose.yml \ No newline at end of file diff --git a/Dockerfile.redis b/redis/Dockerfile.redis similarity index 100% rename from Dockerfile.redis rename to redis/Dockerfile.redis diff --git a/redis.conf b/redis/redis.conf similarity index 100% rename from redis.conf rename to redis/redis.conf diff --git a/src/.dockerignore b/src/.dockerignore new file mode 100644 index 0000000..de29de9 --- /dev/null +++ b/src/.dockerignore @@ -0,0 +1,15 @@ +.github/ +chainguard/ +charts/ +kind/ +kyverno/ +locust/ +manifests/ +scripts/ +redis/ +screenshots/ +LICENSE +OWNERS +.coderabbit.yaml +README.md +docker-compose.yml \ No newline at end of file diff --git a/Dockerfile b/src/Dockerfile similarity index 100% rename from Dockerfile rename to src/Dockerfile diff --git a/app.py b/src/app.py similarity index 100% rename from app.py rename to src/app.py diff --git a/requirements.txt b/src/requirements.txt similarity index 100% rename from requirements.txt rename to src/requirements.txt diff --git a/static/.dockerignore b/src/static/.dockerignore similarity index 100% rename from static/.dockerignore rename to src/static/.dockerignore diff --git a/static/css/output.css b/src/static/css/output.css similarity index 100% rename from static/css/output.css rename to src/static/css/output.css diff --git a/static/css/styles.css b/src/static/css/styles.css similarity index 100% rename from static/css/styles.css rename to src/static/css/styles.css diff --git a/static/js/main.js b/src/static/js/main.js similarity index 100% rename from static/js/main.js rename to src/static/js/main.js diff --git a/static/linuxtips-logo.png b/src/static/linuxtips-logo.png similarity index 100% rename from static/linuxtips-logo.png rename to src/static/linuxtips-logo.png diff --git a/tailwind.config.js b/src/tailwind.config.js similarity index 100% rename from tailwind.config.js rename to src/tailwind.config.js diff --git a/templates/index.html b/src/templates/index.html similarity index 100% rename from templates/index.html rename to src/templates/index.html diff --git a/templates/lista_senhas.html b/src/templates/lista_senhas.html similarity index 100% rename from templates/lista_senhas.html rename to src/templates/lista_senhas.html