Conversation
## Files added: - add new file `Makefile` - add new file `Makefile.assets.mk` - add new file `Makefile.server.mk` - add remote file [`Makefile.semver.mk`](https://github.com/g3w-suite/makefiles/Makefile.semver.mk) - add remote file [`Makefile.venv.mk`](https://github.com/g3w-suite/makefiles/Makefile.venv.mk) ## Deprecated files - `ci_scripts/build_suite.sh` (ref: `make g3w-admin/core/static/bower_components`) - `ci_scripts/run_env_development.sh` (ref: `make run-docker`) - `ci_scripts/setup_suite.sh` (ref: `make setup-suite`) - `pavement.py` (ref. `make install` and `make runserver`) - `run_docker_tests.sh` (ref: `make tests`) ## TODO: - find out how to remove `gulpfile.js` dependency (ref: `make build-assets`) - figure out what happened to the following file: `ci_scripts/Dockerfile.local-develpment-ubuntu-2004.dockerfile` (ref: `make build-docker` and `make run-docker`) - update / remove `ci_scripts/README.md` - add / update contributing section within `README.md` - do some additional in-depth testing on all the docker related scripts (eg. `make tests`)
Raruto
commented
Jan 4, 2023
| make tests \ | ||
| q=${{ matrix.qgis_version }} \ | ||
| mode=test \ | ||
| DOCKER_COMPOSE="docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml" |
Contributor
Author
There was a problem hiding this comment.
Currently the automated tests are run on the Ubuntu 20.04 runner image:
g3w-admin/.github/workflows/test_runner.yml
Lines 7 to 9 in 10f48f8
As per actions/runner-images/images/linux/Ubuntu2004-Readme.md, the docker compose (v2) is installed, so why we can't just use that instead of docker-compose (v1)?
Docker Amazon ECR Credential Helper 0.6.0
Docker Compose v1 1.29.2
Docker Compose v2 2.14.0+azure-1
Docker-Buildx 0.9.1
Docker-Moby Client 20.10.21+azure-2
Docker-Moby Server 20.10.21+azure-2
Contributor
Author
There was a problem hiding this comment.
Docker Compose v1 1.29.2
Docker Compose v2 2.14.0+azure-1
This happens because some of these packets are available for GitHub Actions or Azure DevOps (that's why Docker Compose v2 2.14.0+azure-1 is only available for Azure V1 pipelines)
Ref: runner-images#faqs
runner-images/images/linux/scripts/installers/docker-compose.sh
#!/bin/bash -e
################################################################################
## File: docker-compose.sh
## Desc: Installs Docker Compose
################################################################################
# Install docker-compose v1 from releases
URL="https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64"
curl -L $URL -o /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose
invoke_tests "Tools" "Docker-compose v1"runner-images/images/win/scripts/Installers/Install-Docker.ps1
Write-Host "Install-Package Docker-Compose v1"
Choco-Install -PackageName docker-compose
Write-Host "Install-Package Docker-Compose v2"
$dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe"
$cliPluginsDir = "C:\ProgramData\docker\cli-plugins"
New-Item -Path $cliPluginsDir -ItemType Directory
Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath $cliPluginsDir
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
List of changes:
Added files:
Makefile*Makefile.assets.mkMakefile.tasks.mkMakefile.semver.mk(not included in VCS, remotely downloaded) *Makefile.venv.mk(not included in VCS, remotely downloaded) ** additional implementation notes: g3w-suite/makefiles
Deprecated files:
ci_scripts/build_suite.shreplaced by:make g3w-admin/core/static/bower_componentsci_scripts/run_env_development.shreplaced by:make run-dockerci_scripts/setup_suite.shreplaced by:make setup-suitepavement.pyreplaced by:make installandmake runserverrun_docker_tests.shreplaced by:make testsRefer to the
Makefile.assets.mkandMakefile.tasks.mkfiles for more information about these deprecated filesTODO:
gulpfile.jsdependency (ref:make build-assets)ci_scripts/Dockerfile.local-develpment-ubuntu-2004.dockerfile(ref:make build-dockerandmake run-docker)ci_scripts/README.mdREADME.mdmake tests).github/workflows/test_runner.ymlfile in order to use make tasksmake killservertask in order to replace thepaver killtask (frompavement.py) or deprecate the background parameter inside themake runserver [ foreground = "set any value to disable background" ]Makefile.venv.mk)Makefile.tasks.mk(eg. addingexport PATH := $(VENV_BIN):$(PATH)before declaringPYTHONandPIPvariables ? ref: httpie/Makefile#L13-L22)Closes: #431
Related to: #419, #434, #380, #373