From ae6d32f0409ffb0851fd30338aeffc797672d175 Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 17:41:50 +0200 Subject: [PATCH 01/13] fix pipeline --- .gitea/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 02d1747..6d946e6 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout + uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@3 From cef51019fe25d8e3ebda992e27d9f2ecbf2d1875 Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 17:42:51 +0200 Subject: [PATCH 02/13] fix pipeline --- .gitea/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 6d946e6..4c785d2 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@3 + uses: docker/setup-buildx-action@v3 # - name: Login to Gitea Container Registry # run: echo $CR_PAT | docker login git.walamana.de -u $GITEA_USERNAME --password-stdin From 51128c8a2633ac3ce65070f47e5f44ca0432a29b Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 17:49:20 +0200 Subject: [PATCH 03/13] test --- .gitea/workflows/deploy.yaml | 4 ++-- .gitea/workflows/test.yaml | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .gitea/workflows/test.yaml diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 4c785d2..41394b4 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -13,8 +13,8 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 -# - name: Login to Gitea Container Registry -# run: echo $CR_PAT | docker login git.walamana.de -u $GITEA_USERNAME --password-stdin + - name: Login to Gitea Container Registry + run: echo $CR_PAT | docker login git.walamana.de -u $GITEA_USERNAME --password-stdin - name: Build Docker image run: docker build -t minis-data-old . \ No newline at end of file diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml new file mode 100644 index 0000000..ac19832 --- /dev/null +++ b/.gitea/workflows/test.yaml @@ -0,0 +1,9 @@ +name: "Test" + +on: + push: + +jobs: + show: + runs-on: ubuntu-latest + - run: printenv \ No newline at end of file From f9c986ddfc221af02fe6fc6c727fab4b7571a0ec Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 17:50:01 +0200 Subject: [PATCH 04/13] fix --- .gitea/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index ac19832..f429991 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -6,4 +6,5 @@ on: jobs: show: runs-on: ubuntu-latest + steps: - run: printenv \ No newline at end of file From f3b507ebdb698e777f261a8dbd031d7040f66176 Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 17:59:38 +0200 Subject: [PATCH 05/13] test --- .gitea/workflows/deploy.yaml | 6 +++++- .gitea/workflows/test.yaml | 10 ---------- 2 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 .gitea/workflows/test.yaml diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 41394b4..2e7e5f2 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -14,7 +14,11 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Login to Gitea Container Registry - run: echo $CR_PAT | docker login git.walamana.de -u $GITEA_USERNAME --password-stdin + uses: docker/login-action@v2 + with: + registry: git.walamana.de + username: ${{github.repository_owner}} + password: ${{secrets.GITEA_TOKEN}} - name: Build Docker image run: docker build -t minis-data-old . \ No newline at end of file diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml deleted file mode 100644 index f429991..0000000 --- a/.gitea/workflows/test.yaml +++ /dev/null @@ -1,10 +0,0 @@ -name: "Test" - -on: - push: - -jobs: - show: - runs-on: ubuntu-latest - steps: - - run: printenv \ No newline at end of file From 8814891ad2162dc292bcccd0ac9d4886adeaf231 Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 18:00:16 +0200 Subject: [PATCH 06/13] fix --- .gitea/workflows/deploy.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 2e7e5f2..a925686 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -14,11 +14,11 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Login to Gitea Container Registry - uses: docker/login-action@v2 - with: - registry: git.walamana.de - username: ${{github.repository_owner}} - password: ${{secrets.GITEA_TOKEN}} + uses: docker/login-action@v2 + with: + registry: git.walamana.de + username: ${{github.repository_owner}} + password: ${{secrets.GITEA_TOKEN}} - name: Build Docker image run: docker build -t minis-data-old . \ No newline at end of file From 3269254b48c818540ef24382daea67c3de427dab Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 18:04:39 +0200 Subject: [PATCH 07/13] test --- .gitea/workflows/deploy.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index a925686..ef7c7c4 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -21,4 +21,7 @@ jobs: password: ${{secrets.GITEA_TOKEN}} - name: Build Docker image - run: docker build -t minis-data-old . \ No newline at end of file + run: docker build -t git.walamana.de/walamana/minis-data-old:latest . + + - name: Push Docker image to registry + run: docker push git.walamana.de/walamana/minis-data-old:latest \ No newline at end of file From 4a2687970b7f37130aa749cfd08142a854224714 Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 18:12:17 +0200 Subject: [PATCH 08/13] fix --- .gitea/workflows/deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index ef7c7c4..c2b72ed 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -17,8 +17,8 @@ jobs: uses: docker/login-action@v2 with: registry: git.walamana.de - username: ${{github.repository_owner}} - password: ${{secrets.GITEA_TOKEN}} + username: ${{env.actions_user}} + password: ${{secrets.PACKAGES_TOKEN}} - name: Build Docker image run: docker build -t git.walamana.de/walamana/minis-data-old:latest . From d417708435cbd3e30a56a55c46004dae14f52533 Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 18:13:30 +0200 Subject: [PATCH 09/13] test --- .gitea/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index c2b72ed..837c864 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -17,7 +17,7 @@ jobs: uses: docker/login-action@v2 with: registry: git.walamana.de - username: ${{env.actions_user}} + username: ${{vars.actions_user}} password: ${{secrets.PACKAGES_TOKEN}} - name: Build Docker image From ee05abf4b0ac2d6c4404173761ebeb9bae62f2e5 Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 18:18:22 +0200 Subject: [PATCH 10/13] update --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 3305d80..60b9e8e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -26,7 +26,7 @@ services: timeout: 5s retries: 3 app: - image: minis-data-old + image: git.walamana.de/walamana/minis-data-old:latest restart: always ports: - "8383:8383" From c31d8169cf241bbbe8e54eb891f5d1361a323e5f Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 18:21:28 +0200 Subject: [PATCH 11/13] wip --- .gitignore | 1 - config.js | 9 +++++++++ docker-compose.yaml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 config.js diff --git a/.gitignore b/.gitignore index c6372fa..e9271a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ process.env test.txt -config.js node_modules diff --git a/config.js b/config.js new file mode 100644 index 0000000..86f5e5f --- /dev/null +++ b/config.js @@ -0,0 +1,9 @@ +module.exports = { + database: { + host: process.env.DB_HOST, + user: process.env.DB_USER, + password: process.env.DB_PASSWORD, + database: process.env.DB_DATABASE + }, + port: 8383 +} \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 60b9e8e..2f38ac1 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,7 @@ name: minis-data-old networks: - minis-data-old: {} + minis-data-old: services: db: From d36337aad253b2c07bbce0b64e041627e15fad15 Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 18:24:56 +0200 Subject: [PATCH 12/13] wip --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 2f38ac1..b0e0f87 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -16,7 +16,7 @@ services: networks: - minis-data-old volumes: - - ./init.sql:/docker-entrypoint-initdb.d/init.sql + - "./init.sql:/docker-entrypoint-initdb.d/init.sql" ports: - "3306:3306" healthcheck: From bdb75f462d99c25cdde60cf9ad84d6a083ef63cf Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 18:26:13 +0200 Subject: [PATCH 13/13] wip --- docker-compose.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index b0e0f87..7ca3b51 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,8 +1,5 @@ name: minis-data-old -networks: - minis-data-old: - services: db: image: mariadb:latest @@ -40,4 +37,7 @@ services: DB_HOST: mariadb DB_USER: minis DB_PASSWORD: minis - DB_DATABASE: minis \ No newline at end of file + DB_DATABASE: minis + +networks: + minis-data-old: \ No newline at end of file