From e44dca2464cb06dd94e764de19552794e3df951c Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 16 Mar 2023 12:01:57 +0100 Subject: [PATCH] updates --- Dockerfile | 2 +- apps/api/devTemplates.yaml | 2 +- docker-compose-dev.yaml | 2 +- docker-compose.yaml | 4 ++-- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index adcbee05b..80f56f06a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/pack-$PACK_VERSION -o / RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack COPY --from=build /app/apps/api/build/ . -COPY --from=build /app/others/fluentbit/ ./fluentbit +# COPY --from=build /app/others/fluentbit/ ./fluentbit COPY --from=build /app/apps/ui/build/ ./public COPY --from=build /app/apps/api/prisma/ ./prisma COPY --from=build /app/apps/api/package.json . diff --git a/apps/api/devTemplates.yaml b/apps/api/devTemplates.yaml index f20f97a0a..e4bcde325 100644 --- a/apps/api/devTemplates.yaml +++ b/apps/api/devTemplates.yaml @@ -230,7 +230,7 @@ description: "Open Source realtime backend in 1 file" services: $$id: - image: coollabsio/pocketbase:$$core_version + image: ghcr.io/coollabsio/pocketbase:$$core_version volumes: - $$id-data:/app/pb_data ports: diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml index c3c6d8c54..cbe2e2ffa 100644 --- a/docker-compose-dev.yaml +++ b/docker-compose-dev.yaml @@ -34,7 +34,7 @@ services: networks: - coolify-infra fluent-bit: - image: coollabsio/coolify-fluent-bit:1.0.0 + image: ghcr.io/coollabsio/fluent-bit:1.0.0 command: /fluent-bit/bin/fluent-bit -c /fluent-bit/etc/fluent-bit-dev.conf container_name: coolify-fluentbit volumes: diff --git a/docker-compose.yaml b/docker-compose.yaml index fa802e9df..a3d356c9b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,7 +2,7 @@ version: '3.8' services: coolify: - image: coollabsio/coolify:${TAG:-latest} + image: ghcr.io/coollabsio/coolify:${TAG:-latest} restart: always container_name: coolify ports: @@ -23,7 +23,7 @@ services: networks: - coolify-infra fluent-bit: - image: coollabsio/coolify-fluent-bit:1.0.0 + image: ghcr.io/coollabsio/fluent-bit:1.0.0 container_name: coolify-fluentbit volumes: - 'coolify-logs:/app/logs' diff --git a/package.json b/package.json index b36bcee3b..ac4ede736 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "build:api": "NODE_ENV=production pnpm run --filter api build", "build:ui": "NODE_ENV=production pnpm run --filter ui build", "dockerlogin": "echo $DOCKER_PASS | docker login --username=$DOCKER_USER --password-stdin", - "release:staging:amd": "docker build -t coollabsio/coolify:next . && docker push coollabsio/coolify:next", + "release:staging:amd": "docker build -t ghcr.io/coollabsio/coolify:next . && docker push ghcr.io/coollabsio/coolify:next", "release:local": "rm -fr ./local-serve && mkdir ./local-serve && pnpm build && cp -Rp apps/api/build/* ./local-serve && cp -Rp apps/ui/build/ ./local-serve/public && cp -Rp apps/api/prisma/ ./local-serve/prisma && cp -Rp apps/api/package.json ./local-serve && env | grep '^COOLIFY_' > ./local-serve/.env && cd ./local-serve && pnpm install . && pnpm start" }, "devDependencies": {