Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc fixes #28

Merged
merged 5 commits into from
May 29, 2024
Merged

Misc fixes #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
871389d
Update docker_build_push GHA to v5
sneridagh May 29, 2024
94c567b
Fix use case where you are building image with a previous local build
sneridagh May 29, 2024
9410674
Fix redundant VOLTO_VERSION and PLONE_VERSION in Makefile
sneridagh May 29, 2024
f5470ce
Missing command
sneridagh May 29, 2024
daed5a6
Merge branch 'issue-2-project-template' into sneridagh-misc-fixes
sneridagh May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions project/cookiecutter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@
"volto_version": "{{ 'Yes' | latest_volto }}",
"python_package_name": "{{ cookiecutter.project_slug|replace(' ', '')|replace('-', '.') }}",
"frontend_addon_name": "volto-{{ cookiecutter.python_package_name|replace('_', '-')|replace('.', '-') }}",
"language_code": [
"en",
"de",
"es",
"pt-br",
"nl",
"fi"
],
"language_code": ["en", "de", "es", "pt-br", "nl", "fi"],
"github_organization": "collective",
"container_registry": [
"github",
Expand Down Expand Up @@ -60,7 +53,7 @@
"__gha_version_docker_qemu": "v3",
"__gha_version_docker_buildx": "v3",
"__gha_version_docker_login": "v3",
"__gha_version_docker_build_push": "v4",
"__gha_version_docker_build_push": "v5",
"__devops_host": "{{ cookiecutter.hostname | extract_host }}",
"__devops_compose_name": "{{ cookiecutter.project_slug | replace('.','-') | replace('_','-') }}",
"__devops_stack_name": "{{ cookiecutter.hostname | replace('.','-') | replace('_','-') }}",
Expand Down
2 changes: 0 additions & 2 deletions project/{{ cookiecutter.__folder_name }}/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ GREEN=`tput setaf 2`
RESET=`tput sgr0`
YELLOW=`tput setaf 3`

VOLTO_VERSION=$(VOLTO_VERSION) PLONE_VERSION=$(PLONE_VERSION)

.PHONY: all
all: install

Expand Down
2 changes: 2 additions & 0 deletions sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ RUN <<EOT
mv src/requirements-docker.txt src/requirements.txt
sed -i 's/-e .\[test\]/./g' src/mx.ini
cd /app/src
# remove potentially existing virtualenv from local build
rm -rf .venv
../bin/mxdev -c mx.ini
../bin/uv pip install -r requirements-mxdev.txt
../bin/python /compile_mo.py
Expand Down
2 changes: 2 additions & 0 deletions sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile.acceptance
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ RUN <<EOT
mv src/requirements-docker.txt src/requirements.txt
sed -i 's/-e .\[test\]/./g' src/mx.ini
cd /app/src
# remove potentially existing virtualenv from local build
rm -rf .venv
../bin/mxdev -c mx.ini
../bin/uv pip install -r requirements-mxdev.txt
../bin/python /compile_mo.py
Expand Down
6 changes: 5 additions & 1 deletion sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,11 @@ test: $(BIN_FOLDER)/tox ## run tests
test-coverage: $(BIN_FOLDER)/tox ## run tests with coverage
$(BIN_FOLDER)/tox -e coverage

# Build Docker image
# Build Docker images
.PHONY: build-image
build-image: ## Build Docker Images
@DOCKER_BUILDKIT=1 docker build . -t $(IMAGE_NAME_PREFIX)-backend:$(IMAGE_TAG) -f Dockerfile --build-arg PLONE_VERSION=$(PLONE_VERSION)

.PHONY: acceptance-image-build
acceptance-image-build: ## Build Docker Images
@DOCKER_BUILDKIT=1 docker build . -t $(IMAGE_NAME_PREFIX)-backend-acceptance:$(IMAGE_TAG) -f Dockerfile.acceptance --build-arg PLONE_VERSION=$(PLONE_VERSION)