diff --git a/.github/workflows/fluent-bit-release-dockerhub.yml b/.github/workflows/fluent-bit-release-dockerhub.yml deleted file mode 100644 index 77be7bb95..000000000 --- a/.github/workflows/fluent-bit-release-dockerhub.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: fluent-bit-release - -on: - push: - paths: - - "others/fluentbit" - - ".github/workflows/fluent-bit-release.yml" - branches: - - next - -jobs: - arm64: - runs-on: [self-hosted, arm64] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: others/fluentbit/ - platforms: linux/arm64 - push: true - tags: coollabsio/coolify-fluent-bit:1.0.0-arm64 - amd64: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub - 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: - context: others/fluentbit/ - platforms: linux/amd64 - push: true - tags: coollabsio/coolify-fluent-bit:1.0.0-amd64 - aarch64: - runs-on: [self-hosted, arm64] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: others/fluentbit/ - platforms: linux/aarch64 - push: true - tags: coollabsio/coolify-fluent-bit:1.0.0-aarch64 - merge-manifest: - runs-on: ubuntu-latest - needs: [amd64, arm64, aarch64] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Create & publish manifest - run: | - docker manifest create coollabsio/coolify-fluent-bit:1.0.0 --amend coollabsio/coolify-fluent-bit:1.0.0-amd64 --amend coollabsio/coolify-fluent-bit:1.0.0-arm64 --amend coollabsio/coolify-fluent-bit:1.0.0-aarch64 - docker manifest push coollabsio/coolify-fluent-bit:1.0.0 diff --git a/.github/workflows/fluent-bit-release.yml b/.github/workflows/fluent-bit-release.yml deleted file mode 100644 index e4bf27e7f..000000000 --- a/.github/workflows/fluent-bit-release.yml +++ /dev/null @@ -1,79 +0,0 @@ -name: fluent-bit-release - -on: - push: - paths: - - "others/fluentbit" - - ".github/workflows/fluent-bit-release.yml" - branches: - - next - -env: - REGISTRY: ghcr.io - IMAGE_NAME: "coollabsio/coolify-fluent-bit" - VERSION: "1.0.0" - -jobs: - amd64: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to ghcr.io - uses: docker/login-action@v2 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v3 - with: - context: others/fluentbit/ - platforms: linux/amd64 - push: true - tags: ${{ env.IMAGE_NAME }}:${{ env.VERSION }} - aarch64: - runs-on: [self-hosted, arm64] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to ghcr.io - uses: docker/login-action@v2 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: others/fluentbit/ - platforms: linux/aarch64 - push: true - tags: ${{ env.IMAGE_NAME }}:${{ env.VERSION }}-aarch64 - merge-manifest: - runs-on: ubuntu-latest - needs: [amd64, aarch64] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to ghcr.io - uses: docker/login-action@v2 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Create & publish manifest - run: | - docker buildx imagetools create --amend ${{ env.IMAGE_NAME }}:${{ env.VERSION }}-aarch64 --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }} \ No newline at end of file diff --git a/.github/workflows/pocketbase-release-dockerhub.yml b/.github/workflows/pocketbase-release-dockerhub.yml deleted file mode 100644 index 02b8aa6dd..000000000 --- a/.github/workflows/pocketbase-release-dockerhub.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: pocketbase-release - -on: - push: - paths: - - "others/pocketbase/*" - - ".github/workflows/pocketbase-release.yml" - branches: - - next - - main -jobs: - arm64: - runs-on: [self-hosted, arm64] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: others/pocketbase/ - platforms: linux/arm64 - push: true - tags: coollabsio/pocketbase:0.12.3-arm64 - amd64: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub - 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: - context: others/pocketbase/ - platforms: linux/amd64 - push: true - tags: coollabsio/pocketbase:0.12.3-amd64 - aarch64: - runs-on: [self-hosted, arm64] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: others/pocketbase/ - platforms: linux/aarch64 - push: true - tags: coollabsio/pocketbase:0.12.3-aarch64 - merge-manifest: - runs-on: ubuntu-latest - needs: [amd64, arm64, aarch64] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Create & publish manifest - run: | - docker manifest create coollabsio/pocketbase:0.12.3 --amend coollabsio/pocketbase:0.12.3-amd64 --amend coollabsio/pocketbase:0.12.3-arm64 --amend coollabsio/pocketbase:0.12.3-aarch64 - docker manifest push coollabsio/pocketbase:0.12.3 diff --git a/.github/workflows/pocketbase-release.yml b/.github/workflows/pocketbase-release.yml deleted file mode 100644 index 61a475820..000000000 --- a/.github/workflows/pocketbase-release.yml +++ /dev/null @@ -1,79 +0,0 @@ -name: pocketbase-release - -on: - push: - paths: - - "others/pocketbase/*" - - ".github/workflows/pocketbase-release.yml" - branches: - - next - - main -env: - REGISTRY: ghcr.io - IMAGE_NAME: "coollabsio/pocketbase" - VERSION: "0.12.3" - -jobs: - amd64: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to ghcr.io - uses: docker/login-action@v2 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v3 - with: - context: others/pocketbase/ - platforms: linux/amd64 - push: true - tags: ${{ env.IMAGE_NAME }}:${{ env.VERSION }} - aarch64: - runs-on: [self-hosted, arm64] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to ghcr.io - uses: docker/login-action@v2 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: others/pocketbase/ - platforms: linux/aarch64 - push: true - tags: ${{ env.IMAGE_NAME }}:${{ env.VERSION }}-aarch64 - merge-manifest: - runs-on: ubuntu-latest - needs: [amd64, aarch64] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to ghcr.io - uses: docker/login-action@v2 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Create & publish manifest - run: | - docker buildx imagetools create --amend ${{ env.IMAGE_NAME }}:${{ env.VERSION }}-aarch64 --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }} diff --git a/others/fluentbit/Dockerfile b/others/fluentbit/Dockerfile deleted file mode 100644 index 1e271bb21..000000000 --- a/others/fluentbit/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM fluent/fluent-bit:1.9.8 -COPY ./fluent-bit.conf /fluent-bit/etc/fluent-bit.conf -COPY ./fluent-bit-dev.conf /fluent-bit/etc/fluent-bit-dev.conf -COPY ./parsers.conf /fluent-bit/etc/parsers.conf \ No newline at end of file diff --git a/others/fluentbit/fluent-bit-dev.conf b/others/fluentbit/fluent-bit-dev.conf deleted file mode 100644 index 757b91665..000000000 --- a/others/fluentbit/fluent-bit-dev.conf +++ /dev/null @@ -1,30 +0,0 @@ -[SERVICE] - Parsers_file /fluent-bit/etc/parsers.conf - Flush 1 - Grace 30 -[INPUT] - Name http - Host 0.0.0.0 - Port 24224 -[FILTER] - Name parser - Match * - Key_Name log - Parser jsonparser - Reserve_Data True -[OUTPUT] - Name file - Match * - Path /logs - Mkdir true - Format csv -# [OUTPUT] -# Name influxdb -# match * -# Host coolify-influxdb -# Port 8086 -# Database coolify -# Bucket coolify -# Org coolify -# HTTP_Token 12345678 -# Sequence_Tag _seq \ No newline at end of file diff --git a/others/fluentbit/fluent-bit.conf b/others/fluentbit/fluent-bit.conf deleted file mode 100644 index bd57a17cc..000000000 --- a/others/fluentbit/fluent-bit.conf +++ /dev/null @@ -1,30 +0,0 @@ -[SERVICE] - Parsers_file /fluent-bit/etc/parsers.conf - Flush 1 - Grace 30 -[INPUT] - Name http - Host 0.0.0.0 - Port 24224 -[FILTER] - Name parser - Match * - Key_Name log - Parser jsonparser - Reserve_Data True -[OUTPUT] - Name file - Match * - Path /app/logs - Mkdir true - Format csv -# [OUTPUT] -# Name influxdb -# match * -# Host coolify-influxdb -# Port 8086 -# Database coolify -# Bucket coolify -# Org coolify -# HTTP_Token 12345678 -# Sequence_Tag _seq \ No newline at end of file diff --git a/others/fluentbit/parsers.conf b/others/fluentbit/parsers.conf deleted file mode 100644 index 1833ff578..000000000 --- a/others/fluentbit/parsers.conf +++ /dev/null @@ -1,6 +0,0 @@ -[PARSER] - Name jsonparser - Format json - Time_Key time - Time_Format %Y-%m-%dT%H:%M:%S.%L - Time_Keep On \ No newline at end of file diff --git a/others/pocketbase/Dockerfile b/others/pocketbase/Dockerfile deleted file mode 100644 index 392e8fd53..000000000 --- a/others/pocketbase/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM alpine:3.17 -ARG BUILDARCH -ARG PB_VERSION=0.12.3 -RUN apk add --no-cache \ - unzip \ - ca-certificates - -ADD https://github.com/pocketbase/pocketbase/releases/download/v${PB_VERSION}/pocketbase_${PB_VERSION}_linux_${BUILDARCH}.zip /tmp/pb.zip -RUN unzip /tmp/pb.zip -d /app/ -RUN rm /tmp/pb.zip -EXPOSE 8080 -CMD ["/app/pocketbase", "serve", "--http=0.0.0.0:8080"]