From efec10e6d6eb577265e4df82464ce67f482c70ad Mon Sep 17 00:00:00 2001 From: tobias Date: Mon, 24 Jun 2024 18:00:44 +0200 Subject: [PATCH] Target dockerfile prod step in prod --- .drone.yml | 1 + docker-compose.prod.yml | 1 + tsconfig.json | 35 +++++++++++++++++++++++++++-------- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 28c0dcb..1f05b03 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,6 +5,7 @@ steps: - name: publish nextjs container image: plugins/docker settings: + target: prod username: 3wordchant password: from_secret: git_autonomic_zone_token_3wc diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index e56d25e..8a5dd7a 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -7,6 +7,7 @@ services: environment: - "NAME=${STACK_NAME}" - "PAYLOAD_SECRET_FILE=/run/secrets/payload_secret" + - "BASE_URL=nextload.swarm-demo.autonomic.zone" - "MONGODB_USER=mongo" - "MONGODB_HOST=${STACK_NAME}_mongo" - "MONGODB_PORT=27017" diff --git a/tsconfig.json b/tsconfig.json index 07c8479..5d9a880 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,11 @@ { "compilerOptions": { "baseUrl": ".", - "lib": ["dom", "dom.iterable", "esnext"], + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], "allowJs": true, "skipLibCheck": true, "strict": true, @@ -11,7 +15,7 @@ "moduleResolution": "bundler", "resolveJsonModule": true, "isolatedModules": true, - "jsx": "react-jsx", + "jsx": "preserve", "incremental": true, "plugins": [ { @@ -19,13 +23,28 @@ } ], "paths": { - "@/*": ["./src/*"], - "@payload/*": ["./src/app/(payload)/*"], - "@app/*": ["./src/app/(app)/*"], - "@payload-config": ["./payload.config.ts"] + "@/*": [ + "./src/*" + ], + "@payload/*": [ + "./src/app/(payload)/*" + ], + "@app/*": [ + "./src/app/(app)/*" + ], + "@payload-config": [ + "./payload.config.ts" + ] }, "target": "ES2017" }, - "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], - "exclude": ["node_modules"] + "include": [ + "next-env.d.ts", + "**/*.ts", + "**/*.tsx", + ".next/types/**/*.ts" + ], + "exclude": [ + "node_modules" + ] }