Merge pull request #1963 from tboerger/refactor-docker-and-build

Refactoring/Restructuring for Docker, Compose and Taskfile

.dockerignore

@@ -0,0 +1,2 @@
+web/node_modules/
+vendor/

.dredd/dredd.dev.yml → .dredd/dredd.docker.yml

@@ -1,8 +1,7 @@
 dry-run: null
 hookfiles: ./.dredd/compiled_hooks
 language: go
-#server: context=dev task dc:up
-server-wait: 240
+server-wait: 5
 init: false
 custom: {}
 names: false
@@ -28,4 +27,4 @@ hooks-worker-handler-host: 0.0.0.0
 hooks-worker-handler-port: 61321
 config: ./.dredd/dredd.yml
 blueprint: api-docs.yml
-endpoint: 'http://semaphore_ci:3000'
+endpoint: 'http://server:3000'

.dredd/dredd.local.yml

@@ -1,8 +1,7 @@
 dry-run: null
 hookfiles: ./.dredd/compiled_hooks
 language: go
-#server: context=dev task dc:up
-server-wait: 240
+server-wait: 5
 init: false
 custom: {}
 names: false

.dredd/dredd.yml → .dredd/dredd.testing.yml

@@ -1,8 +1,8 @@
 dry-run: null
 hookfiles: ./.dredd/compiled_hooks
 language: go
-#server: context=dev task dc:up
-server-wait: 240
+server: ./semaphore server --config .dredd/config.json
+server-wait: 5
 init: false
 custom: {}
 names: false
@@ -28,4 +28,4 @@ hooks-worker-handler-host: 0.0.0.0
 hooks-worker-handler-port: 61321
 config: ./.dredd/dredd.yml
 blueprint: api-docs.yml
-endpoint: 'http://semaphore_ci:3000'
+endpoint: 'http://localhost:3000'

.dredd/dredd.windows.yml

@@ -1,8 +1,7 @@
 dry-run: null
 hookfiles: ./.dredd/compiled_hooks.exe
 language: go
-#server: context=dev task dc:up
-server-wait: 240
+server-wait: 5
 init: false
 custom: {}
 names: false

.github/workflows/beta.yml

@@ -1,75 +1,127 @@
 name: Beta
-on:
+
+'on':
  push:
  tags:
  - v*-beta
 
 jobs:
- pre-release:
- runs-on: [ubuntu-latest]
+ prerelease:
+ runs-on: ubuntu-latest
+
  steps:
- - uses: actions/setup-go@v3
- with: { go-version: '1.21' }
+ - name: Checkout source
+ uses: actions/checkout@v4
 
- - uses: actions/setup-node@v3
- with: { node-version: '16' }
+ - name: Setup golang
+ uses: actions/setup-go@v5
+ with:
+ go-version: '^1.21.0'
 
- - run: go install github.com/go-task/task/v3/cmd/task@latest
+ - name: Setup nodejs
+ uses: actions/setup-node@v4
+ with:
+ node-version: '16'
+ cache: 'npm'
+ cache-dependency-path: web/package-lock.json
 
- - run: sudo apt update && sudo apt-get install rpm
+ - name: Install go-task
+ run: |
+ go install github.com/go-task/task/v3/cmd/task@latest
 
- - uses: actions/checkout@v3
+ - name: Install rpm
+ run: |
+ sudo apt update && sudo apt-get install rpm
 
- - run: task deps
+ - name: Install deps
+ run: |
+ task deps
 
- - run: |
- echo ${{ secrets.GPG_KEY }} | tr " " "\n" | base64 -d | gpg --import --batch
+ - name: Import gnupg
+ run: |
+ echo "${{ secrets.GPG_KEY }}" | tr " " "\n" | base64 -d | gpg --import --batch
  gpg --sign -u "58A7 CC3D 8A9C A2E5 BB5C 141D 4064 23EA F814 63CA" --pinentry-mode loopback --yes --batch --passphrase "${{ secrets.GPG_PASS }}" --output unlock.sig --detach-sign README.md
  rm -f unlock.sig
 
- - run: git reset --hard
-
- - run: GITHUB_TOKEN=${{ secrets.GH_TOKEN }} task release:prod
+ - name: Reset repo
+ run: |
+  git reset --hard
 
+ - name: Run release
+ run: |
+ GITHUB_TOKEN=${{ secrets.GH_TOKEN }} task release:prod
 
  deploy-beta:
- runs-on: [ubuntu-latest]
- steps:
- - uses: actions/setup-go@v3
- with: { go-version: '1.21' }
-
- - run: go install github.com/go-task/task/v3/cmd/task@latest
+ runs-on: ubuntu-latest
+ if: github.repository_owner == 'semaphoreui'
 
-  - uses: actions/checkout@v3
-
- - run: context=prod task docker:test
+ steps:
+ - name: Checkout source
+  uses: actions/checkout@v4
 
- - uses: docker/setup-qemu-action@v2
+ - name: Setup qemu
+ id: qemu
+ uses: docker/setup-qemu-action@v3
 
- - uses: docker/setup-buildx-action@v2
+ - name: Setup buildx
+ id: buildx
+ uses: docker/setup-buildx-action@v3
 
- - name: Login to Docker Hub
- uses: docker/login-action@v2
+ - name: Hub login
+ uses: docker/login-action@v3
+ if: github.event_name != 'pull_request'
  with:
  username: ${{ secrets.DOCKER_USER }}
  password: ${{ secrets.DOCKER_PASS }}
 
- - name: Build and push
- uses: docker/build-push-action@v3
+ - name: Server meta
+ id: server
+ uses: docker/metadata-action@v5
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ images: |
+ semaphoreui/semaphore
+ labels: |
+ org.opencontainers.image.vendor=SemaphoreUI
+ maintainer=Semaphore UI <[email protected]>
+ tags: |
+ type=raw,value=${{ github.ref_name }}
+ flavor: |
+ latest=false
+
+ - name: Server build
+ uses: docker/build-push-action@v5
  with:
+ builder: ${{ steps.buildx.outputs.name }}
  context: .
+ file: deployment/docker/server/Dockerfile
  platforms: linux/amd64,linux/arm64
- file: ./deployment/docker/prod/buildx.Dockerfile
- push: true
- tags: semaphoreui/semaphore:beta,semaphoreui/semaphore:${{ github.ref_name }}
+ push: ${{ github.event_name != 'pull_request' }}
+ labels: ${{ steps.server.outputs.labels }}
+ tags: ${{ steps.server.outputs.tags }}
 
-
-
- - name: Build and push runner
- uses: docker/build-push-action@v3
+ - name: Runner meta
+ id: runner
+ uses: docker/metadata-action@v5
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ images: |
+ semaphoreui/runner
+ labels: |
+ org.opencontainers.image.vendor=SemaphoreUI
+ maintainer=Semaphore UI <[email protected]>
+ tags: |
+ type=raw,value=${{ github.ref_name }}
+ flavor: |
+ latest=false
+
+ - name: Runner build
+ uses: docker/build-push-action@v5
  with:
+ builder: ${{ steps.buildx.outputs.name }}
  context: .
+ file: deployment/docker/runner/Dockerfile
  platforms: linux/amd64,linux/arm64
- file: ./deployment/docker/prod/runner.buildx.Dockerfile
- push: true
- tags: semaphoreui/runner:beta,semaphoreui/runner:${{ github.ref_name }}
+ push: ${{ github.event_name != 'pull_request' }}
+ labels: ${{ steps.runner.outputs.labels }}
+ tags: ${{ steps.runner.outputs.tags }}