fix: docker-compose-image-tag fails to start (#31606)
This commit is contained in:
parent
668194d574
commit
ee36cf058c
|
|
@ -14,6 +14,7 @@ concurrency:
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
setup_matrix:
|
setup_matrix:
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
outputs:
|
outputs:
|
||||||
|
|
@ -103,3 +104,29 @@ jobs:
|
||||||
export SUPERSET_BUILD_TARGET=${{ matrix.build_preset }}
|
export SUPERSET_BUILD_TARGET=${{ matrix.build_preset }}
|
||||||
docker compose build superset-init --build-arg DEV_MODE=false --build-arg INCLUDE_CHROMIUM=false
|
docker compose build superset-init --build-arg DEV_MODE=false --build-arg INCLUDE_CHROMIUM=false
|
||||||
docker compose up superset-init --exit-code-from superset-init
|
docker compose up superset-init --exit-code-from superset-init
|
||||||
|
|
||||||
|
docker-compose-image-tag:
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
steps:
|
||||||
|
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
persist-credentials: false
|
||||||
|
- name: Check for file changes
|
||||||
|
id: check
|
||||||
|
uses: ./.github/actions/change-detector/
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
- name: Setup Docker Environment
|
||||||
|
if: steps.check.outputs.docker
|
||||||
|
uses: ./.github/actions/setup-docker
|
||||||
|
with:
|
||||||
|
dockerhub-user: ${{ secrets.DOCKERHUB_USER }}
|
||||||
|
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
build: "false"
|
||||||
|
install-docker-compose: "true"
|
||||||
|
- name: docker-compose sanity check
|
||||||
|
if: steps.check.outputs.docker
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
docker compose -f docker-compose-image-tag.yml up --exit-code-from superset-init
|
||||||
|
|
|
||||||
|
|
@ -18,13 +18,12 @@
|
||||||
|
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
|
|
||||||
# UV may not be installed in older images
|
|
||||||
pip install uv
|
|
||||||
|
|
||||||
# Make python interactive
|
# Make python interactive
|
||||||
if [ "$DEV_MODE" == "true" ]; then
|
if [ "$DEV_MODE" == "true" ]; then
|
||||||
echo "Reinstalling the app in editable mode"
|
if command -v uv > /dev/null 2>&1; then
|
||||||
uv pip install -e .
|
echo "Reinstalling the app in editable mode"
|
||||||
|
uv pip install -e .
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
REQUIREMENTS_LOCAL="/app/docker/requirements-local.txt"
|
REQUIREMENTS_LOCAL="/app/docker/requirements-local.txt"
|
||||||
# If Cypress run – overwrite the password for admin and export env variables
|
# If Cypress run – overwrite the password for admin and export env variables
|
||||||
|
|
@ -35,7 +34,13 @@ if [ "$CYPRESS_CONFIG" == "true" ]; then
|
||||||
fi
|
fi
|
||||||
if [[ "$DATABASE_DIALECT" == postgres* ]] ; then
|
if [[ "$DATABASE_DIALECT" == postgres* ]] ; then
|
||||||
echo "Installing postgres requirements"
|
echo "Installing postgres requirements"
|
||||||
uv pip install -e .[postgres]
|
if command -v uv > /dev/null 2>&1; then
|
||||||
|
# Use uv in newer images
|
||||||
|
uv pip install -e .[postgres]
|
||||||
|
else
|
||||||
|
# Use pip in older images
|
||||||
|
pip install -e .[postgres]
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
#
|
#
|
||||||
# Make sure we have dev requirements installed
|
# Make sure we have dev requirements installed
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ PATTERNS = {
|
||||||
],
|
],
|
||||||
"docker": [
|
"docker": [
|
||||||
r"^Dockerfile$",
|
r"^Dockerfile$",
|
||||||
r"^docker/",
|
r"^docker.*",
|
||||||
],
|
],
|
||||||
"docs": [
|
"docs": [
|
||||||
r"^docs/",
|
r"^docs/",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue