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

Updates/2023 10 #775

Open
wants to merge 6 commits into
base: 1.x
Choose a base branch
from
Open

Updates/2023 10 #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24db339
Use same image for devshop.remote container so it doesn't have to bui…
jonpugh Oct 25, 2023
2cd3ee6
Composer package updates:
jonpugh Oct 25, 2023
3419400
Composer package updates:
jonpugh Oct 25, 2023
5dc24db
Add php-zip.
jonpugh Oct 25, 2023
b4e64e0
Skip running on devshop_remote
jonpugh Oct 25, 2023
0145a63
Composer package updates:
jonpugh Oct 25, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/devshop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
# Since the container is launched with a new DEVSHOP_DOCKER_COMMAND_RUN, run the default.
run: |
docker-compose exec -T devshop.server bash -c '${DEFAULT_DEVSHOP_DOCKER_COMMAND_RUN}'
docker-compose exec -T devshop.remote bash -c '${DEFAULT_DEVSHOP_DOCKER_COMMAND_RUN}'
# docker-compose exec -T devshop.remote bash -c '${DEFAULT_DEVSHOP_DOCKER_COMMAND_RUN}'

- name: "Test DevShop"
working-directory: docker
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ services:
- DEVSHOP_ANSIBLE_GROUP_NAME=devshop_server

devshop.remote:
image: devshop/remote:latest
image: ${DEVSHOP_DOCKER_IMAGE:-devshop/server:php8.1}
build:
context: ".."
dockerfile: "docker/Dockerfile.remote"
Expand Down
1 change: 1 addition & 0 deletions roles/opendevshop.apache/vars/Debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ php_packages_extra:
- libapache2-mod-php8.1
- "php{{ php_version }}-bcmath"
- "php{{ php_version }}-intl"
- "php{{ php_version }}-zip"

# opendevshop.apache/tasks/main.yml disables all the mods, then enables these.
apache_mods_enabled:
Expand Down
127 changes: 63 additions & 64 deletions src/DevShop/Control/composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading