カスタム sablier イメージをビルドするように (#998)

traPtitech · Jan 18, 2025 · e924c90 · e924c90
1 parent 467eae4
commit e924c90
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 2 deletions.
diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml
@@ -46,3 +46,41 @@ jobs:
           # NOTE: once https://github.com/argoproj/argo-cd/pull/13199 is released we can use short sha
           tags: ghcr.io/traptitech/ns-dashboard:preview-${{ env.PR_NUMBER }}-${{ github.event.pull_request.head.sha }}
           cache-from: type=registry,ref=ghcr.io/traptitech/ns-dashboard:buildcache
+
+  build-sablier-image:
+    name: Build Sablier Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set PR_NUMBER env
+        run: echo "PR_NUMBER=${{ github.event.number }}" >> $GITHUB_ENV
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: false
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Builder instance name
+        run: echo ${{ steps.buildx.outputs.name }}
+      - name: Available platforms
+        run: echo ${{ steps.buildx.outputs.platforms }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: traptitech
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build
+        uses: docker/build-push-action@v6
+        with:
+          context: sablier
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ghcr.io/traptitech/ns-sablier:preview-${{ env.PR_NUMBER }}-${{ github.event.pull_request.head.sha }}
+          cache-from: type=registry,ref=ghcr.io/traptitech/ns-sablier:buildcache
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -128,12 +128,49 @@ jobs:
             ghcr.io/traptitech/ns-dashboard:${{ env.APP_VERSION }}
           cache-from: type=registry,ref=ghcr.io/traptitech/ns-dashboard:buildcache
 
+  build-sablier-image:
+    name: Build Sablier Image
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set APP_VERSION env
+        run: echo "APP_VERSION=$(echo ${GITHUB_REF:11})" >> $GITHUB_ENV
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Builder instance name
+        run: echo ${{ steps.buildx.outputs.name }}
+      - name: Available platforms
+        run: echo ${{ steps.buildx.outputs.platforms }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: traptitech
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build
+        uses: docker/build-push-action@v6
+        with:
+          context: sablier
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/traptitech/ns-sablier:latest
+            ghcr.io/traptitech/ns-sablier:${{ env.APP_VERSION }}
+          cache-from: type=registry,ref=ghcr.io/traptitech/ns-sablier:buildcache
+
   dispatch-renovate:
     name: Dispatch Renovate
     runs-on: ubuntu-latest
     needs:
       - build-component-images
       - build-dashboard-image
+      - build-sablier-image
     steps:
       - uses: actions/github-script@v7
         with:

diff --git a/.local-manifest/sablier/sablier-deployment.yaml b/.local-manifest/sablier/sablier-deployment.yaml
@@ -30,5 +30,5 @@ spec:
               subPath: .local-dev/config/sablier.yaml
               mountPath: /etc/sablier/sablier.yaml
             - name: project
-              subPath: dashboard/sablier-theme
+              subPath: sablier/themes
               mountPath: /etc/sablier/themes
diff --git a/compose.yaml b/compose.yaml
@@ -397,7 +397,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./.local-dev/config/sablier.yaml:/etc/sablier/sablier.yaml
-      - ./dashboard/sablier-theme:/etc/sablier/themes
+      - ./sablier/themes:/etc/sablier/themes
 
   traefik:
     image: traefik:3.1

diff --git a/sablier/Dockerfile b/sablier/Dockerfile
@@ -0,0 +1,3 @@
+FROM sablierapp/sablier:1.8.2
+
+COPY ./themes /etc/sablier/themes
diff --git a/dashboard/sablier-theme/neoshowcase.html → sablier/themes/neoshowcase.html b/dashboard/sablier-theme/neoshowcase.html → sablier/themes/neoshowcase.html
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FROM sablierapp/sablier:1.8.2

		COPY ./themes /etc/sablier/themes