Skip to content

Commit

Permalink
chore: change Docker image tags
Browse files Browse the repository at this point in the history
- *-full -> *
- * -> *-no-plugins
  • Loading branch information
loicmathieu committed Aug 2, 2024
1 parent 02ad5bf commit 0d9df7e
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Now, you need to start a backend server, you could:
```yaml
services:
kestra:
image: kestra/kestra:latest-full
image: kestra/kestra:latest
user: "root"
command: server local
environment:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ jobs:
strategy:
matrix:
image:
- name: ""
- name: "-no-plugins"
plugins: ""
packages: ""
python-libs: ""
- name: "-full"
- name: ""
plugins: ${{needs.plugins.outputs.plugins}}
packages: python3 python3-venv python-is-python3 python3-pip nodejs npm curl zip unzip
python-libs: kestra
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
required: false
docker-image-tag:
description: "The Docker image Tag for Kestra"
default: 'kestra/kestra:develop-full'
default: 'kestra/kestra:develop'
type: string
required: true
backend:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
TAG="build-${{ github.run_id }}";
fi
echo "tag=${TAG}" >> $GITHUB_OUTPUT
echo "artifact=docker-kestra-${TAG}-full" >> $GITHUB_OUTPUT
echo "artifact=docker-kestra-${TAG}" >> $GITHUB_OUTPUT
# Docker setup
- name: Set up QEMU
Expand All @@ -127,7 +127,7 @@ jobs:
push: false
file: Dockerfile
tags: |
kestra/kestra:${{ steps.vars.outputs.tag }}-full
kestra/kestra:${{ steps.vars.outputs.tag }}
build-args: |
KESTRA_PLUGINS=${{ steps.plugins.outputs.plugins }}
APT_PACKAGES=${{ env.DOCKER_APT_PACKAGES }}
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
with:
tags: oss
docker-artifact-name: ${{ needs.build-artifacts.outputs.docker-artifact-name }}
docker-image-tag: kestra/kestra:${{ needs.build-artifacts.outputs.docker-tag }}-full
docker-image-tag: kestra/kestra:${{ needs.build-artifacts.outputs.docker-tag }}
backend: ${{ matrix.backends }}
secrets:
GITHUB_AUTH_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}
Expand Down Expand Up @@ -305,11 +305,11 @@ jobs:
strategy:
matrix:
image:
- tag: ${{needs.build-artifacts.outputs.docker-tag}}
- tag: ${{needs.build-artifacts.outputs.docker-tag}}-no-plugins
packages: ""
python-libraries: ""

- tag: ${{needs.build-artifacts.outputs.docker-tag}}-full
- tag: ${{needs.build-artifacts.outputs.docker-tag}}
plugins: ${{needs.build-artifacts.outputs.plugins}}
packages: python3 python3-venv python-is-python3 python3-pip nodejs npm curl zip unzip
python-libraries: kestra
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/vulnerabilities-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
path: build/reports/dependency-check-report.html

develop-image-check:
name: Image Check (develop-full)
name: Image Check (develop)
runs-on: ubuntu-latest
steps:
# Checkout
Expand All @@ -74,13 +74,13 @@ jobs:
- name: Docker Vulnerabilities Check
uses: aquasecurity/trivy-action@0.24.0
with:
image-ref: kestra/kestra:develop-full
image-ref: kestra/kestra:develop
format: table
skip-dirs: /app/plugins
scanners: vuln

latest-image-check:
name: Image Check (latest-full)
name: Image Check (latest)
runs-on: ubuntu-latest
steps:
# Checkout
Expand All @@ -107,7 +107,7 @@ jobs:
- name: Docker Vulnerabilities Check
uses: aquasecurity/trivy-action@0.24.0
with:
image-ref: kestra/kestra:latest-full
image-ref: kestra/kestra:latest
format: table
skip-dirs: /app/plugins
scanners: vuln
2 changes: 1 addition & 1 deletion docker-compose-dind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ services:
- tmp-data:/tmp/kestra-wd

kestra:
image: kestra/kestra:latest-full
image: kestra/kestra:latest
pull_policy: always
# Note that this is meant for development only. Refer to the documentation for production deployments of Kestra which runs without a root user.
user: "root"
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ services:
retries: 10

kestra:
image: kestra/kestra:latest-full
image: kestra/kestra:latest
pull_policy: always
# Note that this setup with a root user is intended for development purpose. For production deployments, you might prefer a version without a root user.
# Our base image runs without root, but the Docker Compose implementation needs root to access the Docker socket
# This version is rootless but more complex https://github.com/kestra-io/kestra/blob/develop/docker-compose-dind.yml
# Our base image runs without root, but the Docker Compose implementation needs root to access the Docker socket
# This version is rootless but more complex https://github.com/kestra-io/kestra/blob/develop/docker-compose-dind.yml
user: "root"
command: server standalone --worker-thread=128
volumes:
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/docker/docker-compose-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ services:
condition: service_completed_successfully

kestra:
image: "${KESTRA_DOCKER_IMAGE:-kestra/kestra:develop-full}"
image: "${KESTRA_DOCKER_IMAGE:-kestra/kestra:develop}"
entrypoint:
- bash
- -c
Expand Down

0 comments on commit 0d9df7e

Please sign in to comment.