From 639afaae47b2182dcde1f67432c8bebf4cf3d2a9 Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Sun, 23 Oct 2022 19:14:36 +0200 Subject: [PATCH 01/10] =?UTF-8?q?=F0=9F=9A=B8=20added=20root=20password?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index d4ba18c..0941a1a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,7 @@ services: - PUID=1000 - PGID=1000 - TZ=Region/City + - MYSQL_ROOT_PASSWORD=root - MYSQL_DATABASE=database - MYSQL_USER=username - MYSQL_PASSWORD=password From d4eed15465043cf9ae0fb7b177735f06d6be560f Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Sun, 23 Oct 2022 19:17:53 +0200 Subject: [PATCH 02/10] =?UTF-8?q?=F0=9F=9A=80=20Ready=20for=20merge=20to?= =?UTF-8?q?=20ZynerOrg/xyter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-image.yml | 28 ++++++++++++++-------------- docker-compose.yml | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index c27a80c..36aadf5 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,20 +1,24 @@ name: Docker Image CI on: + schedule: + - cron: "0 10 * * *" push: branches: - - main - - dev + - "**" + tags: + - "v*.*.*" + pull_request: + branches: + - "main" jobs: docker: runs-on: ubuntu-latest steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v3 - - - name: Docker meta + - name: Docker meta id: meta uses: docker/metadata-action@v4 with: @@ -30,20 +34,16 @@ jobs: type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} type=sha - - - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push + - name: Build and push uses: docker/build-push-action@v3 with: push: ${{ github.event_name != 'pull_request' }} diff --git a/docker-compose.yml b/docker-compose.yml index 0941a1a..89ccfdd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.7" services: app: container_name: app - image: vermiumwastaken/xyter + image: zyner/xyter:dev restart: unless-stopped env_file: - .env From 247bc3150eb4989e975aae12818db5e563dad7c1 Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Sun, 23 Oct 2022 19:19:50 +0200 Subject: [PATCH 03/10] =?UTF-8?q?=F0=9F=92=A1=20added=20comment=20to=20cre?= =?UTF-8?q?dits.transfer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/helpers/credits/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/helpers/credits/index.ts b/src/helpers/credits/index.ts index 78afdcd..13bb6af 100644 --- a/src/helpers/credits/index.ts +++ b/src/helpers/credits/index.ts @@ -1,6 +1,7 @@ import { Guild, User } from "discord.js"; import prisma from "../../handlers/database"; +// Start an transaction between two users in a guild. export const transfer = async ( guild: Guild, from: User, From 210aacdb04561bbca505d3ff7c16732e7a5bc130 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Sun, 23 Oct 2022 17:20:00 +0000 Subject: [PATCH 04/10] Restyled by jq --- tsconfig.json | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index f97b5e0..5e0adef 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,8 +14,16 @@ "outDir": "./dist", "rootDir": "./src", "resolveJsonModule": true, - "typeRoots": ["/types/common", "./node_modules/@types"] + "typeRoots": [ + "/types/common", + "./node_modules/@types" + ] }, - "include": ["./src"], - "exclude": ["./node_modules", "./test"] + "include": [ + "./src" + ], + "exclude": [ + "./node_modules", + "./test" + ] } From a42108d795acc79cb035aa321f20be40e06b7225 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Sun, 23 Oct 2022 17:20:01 +0000 Subject: [PATCH 05/10] Restyled by pg_format --- .../20221023164351_init/migration.sql | 130 +++++++++++------- 1 file changed, 84 insertions(+), 46 deletions(-) diff --git a/prisma/migrations/20221023164351_init/migration.sql b/prisma/migrations/20221023164351_init/migration.sql index aa2b00c..29dcd40 100644 --- a/prisma/migrations/20221023164351_init/migration.sql +++ b/prisma/migrations/20221023164351_init/migration.sql @@ -6,116 +6,154 @@ CREATE TABLE `Guild` ( `embedColorError` VARCHAR(191) NOT NULL DEFAULT '#bb2124', `embedFooterText` VARCHAR(191) NOT NULL DEFAULT 'https://github.com/ZynerOrg/xyter', `embedFooterIcon` VARCHAR(191) NOT NULL DEFAULT 'https://github.com/ZynerOrg.png', - `creditsEnabled` BOOLEAN NOT NULL DEFAULT false, + `creditsEnabled` BOOLEAN NOT NULL DEFAULT FALSE, `creditsRate` INTEGER NOT NULL DEFAULT 1, `creditsTimeout` INTEGER NOT NULL DEFAULT 5, `creditsWorkRate` INTEGER NOT NULL DEFAULT 25, `creditsWorkTimeout` INTEGER NOT NULL DEFAULT 86400, `creditsMinimumLength` INTEGER NOT NULL DEFAULT 5, - `pointsEnabled` BOOLEAN NOT NULL DEFAULT false, + `pointsEnabled` BOOLEAN NOT NULL DEFAULT FALSE, `pointsRate` INTEGER NOT NULL DEFAULT 1, `pointsTimeout` INTEGER NOT NULL DEFAULT 5, `pointsMinimumLength` INTEGER NOT NULL DEFAULT 5, - `reputationsEnabled` BOOLEAN NOT NULL DEFAULT false, - `countersEnabled` BOOLEAN NOT NULL DEFAULT false, + `reputationsEnabled` BOOLEAN NOT NULL DEFAULT FALSE, + `countersEnabled` BOOLEAN NOT NULL DEFAULT FALSE, `apiCpggUrlIv` VARCHAR(191) NULL, `apiCpggUrlContent` VARCHAR(191) NULL, `apiCpggTokenIv` VARCHAR(191) NULL, `apiCpggTokenContent` VARCHAR(191) NULL, - `auditsEnabled` BOOLEAN NOT NULL DEFAULT false, + `auditsEnabled` BOOLEAN NOT NULL DEFAULT FALSE, `auditsChannelId` VARCHAR(191) NULL, - `shopRolesEnabled` BOOLEAN NOT NULL DEFAULT false, + `shopRolesEnabled` BOOLEAN NOT NULL DEFAULT FALSE, `shopRolesPricePerHour` INTEGER NOT NULL DEFAULT 5, - `welcomeEnabled` BOOLEAN NOT NULL DEFAULT false, + `welcomeEnabled` BOOLEAN NOT NULL DEFAULT FALSE, `welcomeJoinChannelId` VARCHAR(191) NULL, `welcomeJoinChannelMessage` VARCHAR(191) NULL, `welcomeLeaveChannelId` VARCHAR(191) NULL, `welcomeLeaveChannelMessage` VARCHAR(191) NULL, - `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), - `updatedAt` DATETIME(3) NOT NULL, - - UNIQUE INDEX `Guild_id_key`(`id`) -) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + `createdAt` DATETIME (3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), + `updatedAt` DATETIME (3) NOT NULL, + UNIQUE INDEX `Guild_id_key` (`id`)) +DEFAULT CHARACTER +SET utf8mb4 COLLATE utf8mb4_unicode_ci; -- CreateTable + CREATE TABLE `User` ( `id` VARCHAR(191) NOT NULL, `reputationsEarned` INTEGER NOT NULL DEFAULT 0, - `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), - `updatedAt` DATETIME(3) NOT NULL, - - UNIQUE INDEX `User_id_key`(`id`) -) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + `createdAt` DATETIME (3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), + `updatedAt` DATETIME (3) NOT NULL, + UNIQUE INDEX `User_id_key` (`id`)) +DEFAULT CHARACTER +SET utf8mb4 COLLATE utf8mb4_unicode_ci; -- CreateTable + CREATE TABLE `GuildMember` ( `userId` VARCHAR(191) NOT NULL, `guildId` VARCHAR(191) NOT NULL, `creditsEarned` INTEGER NOT NULL DEFAULT 0, `pointsEarned` INTEGER NOT NULL DEFAULT 0, - `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), - `updatedAt` DATETIME(3) NOT NULL, - - UNIQUE INDEX `GuildMember_userId_guildId_key`(`userId`, `guildId`) -) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + `createdAt` DATETIME (3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), + `updatedAt` DATETIME (3) NOT NULL, + UNIQUE INDEX `GuildMember_userId_guildId_key` (`userId`, `guildId`)) +DEFAULT CHARACTER +SET utf8mb4 COLLATE utf8mb4_unicode_ci; -- CreateTable + CREATE TABLE `GuildCounter` ( `guildId` VARCHAR(191) NOT NULL, `channelId` VARCHAR(191) NOT NULL, `triggerWord` VARCHAR(191) NOT NULL, `count` INTEGER NOT NULL DEFAULT 0, - `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), - `updatedAt` DATETIME(3) NOT NULL, - - UNIQUE INDEX `GuildCounter_guildId_channelId_key`(`guildId`, `channelId`) -) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + `createdAt` DATETIME (3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), + `updatedAt` DATETIME (3) NOT NULL, + UNIQUE INDEX `GuildCounter_guildId_channelId_key` (`guildId`, `channelId`)) +DEFAULT CHARACTER +SET utf8mb4 COLLATE utf8mb4_unicode_ci; -- CreateTable + CREATE TABLE `Cooldown` ( `guildId` VARCHAR(191) NOT NULL, `userId` VARCHAR(191) NOT NULL, `cooldown` INTEGER NOT NULL, `timeoutId` VARCHAR(191) NOT NULL, - `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), - `updatedAt` DATETIME(3) NOT NULL, - - UNIQUE INDEX `Cooldown_guildId_userId_timeoutId_key`(`guildId`, `userId`, `timeoutId`) -) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + `createdAt` DATETIME (3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), + `updatedAt` DATETIME (3) NOT NULL, + UNIQUE INDEX `Cooldown_guildId_userId_timeoutId_key` (`guildId`, `userId`, `timeoutId`)) +DEFAULT CHARACTER +SET utf8mb4 COLLATE utf8mb4_unicode_ci; -- CreateTable + CREATE TABLE `GuildShopRoles` ( `guildId` VARCHAR(191) NOT NULL, `roleId` VARCHAR(191) NOT NULL, `userId` VARCHAR(191) NOT NULL, `pricePerHour` INTEGER NOT NULL DEFAULT 5, - `lastPayed` DATETIME(3) NOT NULL, - `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), - `updatedAt` DATETIME(3) NOT NULL, - - UNIQUE INDEX `GuildShopRoles_guildId_userId_roleId_key`(`guildId`, `userId`, `roleId`) -) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + `lastPayed` DATETIME (3) NOT NULL, + `createdAt` DATETIME (3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), + `updatedAt` DATETIME (3) NOT NULL, + UNIQUE INDEX `GuildShopRoles_guildId_userId_roleId_key` (`guildId`, `userId`, `roleId`)) +DEFAULT CHARACTER +SET utf8mb4 COLLATE utf8mb4_unicode_ci; -- AddForeignKey -ALTER TABLE `GuildMember` ADD CONSTRAINT `GuildMember_userId_fkey` FOREIGN KEY (`userId`) REFERENCES `User`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE; + +ALTER TABLE `GuildMember` + ADD CONSTRAINT `GuildMember_userId_fkey` FOREIGN KEY (`userId`) REFERENCES `User` (`id`) ON DELETE RESTRICT ON + UPDATE + CASCADE; -- AddForeignKey -ALTER TABLE `GuildMember` ADD CONSTRAINT `GuildMember_guildId_fkey` FOREIGN KEY (`guildId`) REFERENCES `Guild`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE; + +ALTER TABLE `GuildMember` + ADD CONSTRAINT `GuildMember_guildId_fkey` FOREIGN KEY (`guildId`) REFERENCES `Guild` (`id`) ON DELETE RESTRICT ON + UPDATE + CASCADE; -- AddForeignKey -ALTER TABLE `GuildCounter` ADD CONSTRAINT `GuildCounter_guildId_fkey` FOREIGN KEY (`guildId`) REFERENCES `Guild`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE; + +ALTER TABLE `GuildCounter` + ADD CONSTRAINT `GuildCounter_guildId_fkey` FOREIGN KEY (`guildId`) REFERENCES `Guild` (`id`) ON DELETE RESTRICT ON + UPDATE + CASCADE; -- AddForeignKey -ALTER TABLE `Cooldown` ADD CONSTRAINT `Cooldown_guildId_fkey` FOREIGN KEY (`guildId`) REFERENCES `Guild`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE; + +ALTER TABLE `Cooldown` + ADD CONSTRAINT `Cooldown_guildId_fkey` FOREIGN KEY (`guildId`) REFERENCES `Guild` (`id`) ON DELETE RESTRICT ON + UPDATE + CASCADE; -- AddForeignKey -ALTER TABLE `Cooldown` ADD CONSTRAINT `Cooldown_userId_fkey` FOREIGN KEY (`userId`) REFERENCES `User`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE; + +ALTER TABLE `Cooldown` + ADD CONSTRAINT `Cooldown_userId_fkey` FOREIGN KEY (`userId`) REFERENCES `User` (`id`) ON DELETE RESTRICT ON + UPDATE + CASCADE; -- AddForeignKey -ALTER TABLE `GuildShopRoles` ADD CONSTRAINT `GuildShopRoles_guildId_fkey` FOREIGN KEY (`guildId`) REFERENCES `Guild`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE; + +ALTER TABLE `GuildShopRoles` + ADD CONSTRAINT `GuildShopRoles_guildId_fkey` FOREIGN KEY (`guildId`) REFERENCES `Guild` (`id`) ON DELETE RESTRICT ON + UPDATE + CASCADE; -- AddForeignKey -ALTER TABLE `GuildShopRoles` ADD CONSTRAINT `GuildShopRoles_userId_fkey` FOREIGN KEY (`userId`) REFERENCES `User`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE; + +ALTER TABLE `GuildShopRoles` + ADD CONSTRAINT `GuildShopRoles_userId_fkey` FOREIGN KEY (`userId`) REFERENCES `User` (`id`) ON DELETE RESTRICT ON + UPDATE + CASCADE; -- AddForeignKey -ALTER TABLE `GuildShopRoles` ADD CONSTRAINT `GuildShopRoles_userId_guildId_fkey` FOREIGN KEY (`userId`, `guildId`) REFERENCES `GuildMember`(`userId`, `guildId`) ON DELETE RESTRICT ON UPDATE CASCADE; + +ALTER TABLE `GuildShopRoles` + ADD CONSTRAINT `GuildShopRoles_userId_guildId_fkey` FOREIGN KEY (`userId`, `guildId`) REFERENCES `GuildMember` (`userId`, `guildId`) ON DELETE RESTRICT ON + UPDATE + CASCADE; + From ea2e0264bca047948e71f89bb262ce81310db29c Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Sun, 23 Oct 2022 17:20:04 +0000 Subject: [PATCH 06/10] Restyled by prettier-json --- tsconfig.json | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 5e0adef..f97b5e0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,16 +14,8 @@ "outDir": "./dist", "rootDir": "./src", "resolveJsonModule": true, - "typeRoots": [ - "/types/common", - "./node_modules/@types" - ] + "typeRoots": ["/types/common", "./node_modules/@types"] }, - "include": [ - "./src" - ], - "exclude": [ - "./node_modules", - "./test" - ] + "include": ["./src"], + "exclude": ["./node_modules", "./test"] } From 53cc978677e34d468706db41c970ec46db7b8630 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Sun, 23 Oct 2022 17:20:05 +0000 Subject: [PATCH 07/10] Restyled by whitespace --- Dockerfile | 2 +- prisma/migrations/20221023164351_init/migration.sql | 1 - prisma/migrations/migration_lock.toml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 30469f4..26863df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,4 +22,4 @@ COPY --from=builder /app/package*.json ./ COPY --from=builder /app/dist ./dist COPY --from=builder /app/prisma ./prisma -CMD [ "npm", "run", "start:migrate:prod" ] \ No newline at end of file +CMD [ "npm", "run", "start:migrate:prod" ] diff --git a/prisma/migrations/20221023164351_init/migration.sql b/prisma/migrations/20221023164351_init/migration.sql index 29dcd40..6c8b330 100644 --- a/prisma/migrations/20221023164351_init/migration.sql +++ b/prisma/migrations/20221023164351_init/migration.sql @@ -156,4 +156,3 @@ ALTER TABLE `GuildShopRoles` ADD CONSTRAINT `GuildShopRoles_userId_guildId_fkey` FOREIGN KEY (`userId`, `guildId`) REFERENCES `GuildMember` (`userId`, `guildId`) ON DELETE RESTRICT ON UPDATE CASCADE; - diff --git a/prisma/migrations/migration_lock.toml b/prisma/migrations/migration_lock.toml index e5a788a..9bee74d 100644 --- a/prisma/migrations/migration_lock.toml +++ b/prisma/migrations/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "mysql" \ No newline at end of file +provider = "mysql" From 91f75b10f1afac8d01b8af0936841b7b5e2e4408 Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Sun, 23 Oct 2022 19:23:30 +0200 Subject: [PATCH 08/10] Create docker-image.yml --- .github/workflows/docker-image.yml | 51 ++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..c27a80c --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,51 @@ +name: Docker Image CI + +on: + push: + branches: + - main + - dev + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + # list of Docker images to use as base name for tags + images: | + zyner/xyter + # generate Docker tags based on the following events/attributes + tags: | + type=schedule + type=ref,event=branch + type=ref,event=pr + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v3 + with: + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From c57e0c603cd94337b4ea6b7fdb524dfe8c651687 Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Sun, 23 Oct 2022 19:28:25 +0200 Subject: [PATCH 09/10] Update docker-image.yml --- .github/workflows/docker-image.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index c27a80c..36aadf5 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,20 +1,24 @@ name: Docker Image CI on: + schedule: + - cron: "0 10 * * *" push: branches: - - main - - dev + - "**" + tags: + - "v*.*.*" + pull_request: + branches: + - "main" jobs: docker: runs-on: ubuntu-latest steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v3 - - - name: Docker meta + - name: Docker meta id: meta uses: docker/metadata-action@v4 with: @@ -30,20 +34,16 @@ jobs: type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} type=sha - - - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push + - name: Build and push uses: docker/build-push-action@v3 with: push: ${{ github.event_name != 'pull_request' }} From 0ada75c815065cd2fa9920a414b29772e9228fe8 Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Sun, 23 Oct 2022 19:36:38 +0200 Subject: [PATCH 10/10] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 89ccfdd..3abf3c8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.7" services: app: container_name: app - image: zyner/xyter:dev + image: zyner/xyter:main restart: unless-stopped env_file: - .env