Skip to content

Commit

Permalink
Merge pull request #10 from OXIDprojects/oxid7.0
Browse files Browse the repository at this point in the history
Make OXID 7 new default
  • Loading branch information
SvenBrunk authored Sep 22, 2023
2 parents b468beb + 85efa37 commit d99c4e1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: ["7.4","8.0","8.1"]
php: ["8.0", "8.1"]
services:
mysql:
image: mariadb:10.4
image: mysql:8
env:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: oxid
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
- name: test image
run: docker exec oxid composer -v
- name: install oxid
run: docker exec oxid composer create-project --no-interaction -s dev --no-dev oxid-esales/oxideshop-project . dev-b-6.5-ce
run: docker exec oxid composer create-project --no-interaction -s dev --no-dev oxid-esales/oxideshop-project . dev-b-7.0-ce
# - name: run oxid console
# run: docker exec oxid vendor/bin/oe-console
- name: Docker Login
Expand Down
1 change: 0 additions & 1 deletion composer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ RUN curl -LO https://phar.io/releases/phive.phar && \

ENV COMPOSER_ALLOW_SUPERUSER=1
ENV COMPOSER_NO_INTERACTION=1

2 changes: 1 addition & 1 deletion tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG remoteTools="rsync wget openssh-client"
ARG fontTools="fontforge ttfautohint"
ARG editors="less nano"
#gnupg needed by phive to install other php tools
ARG tools="$editors $fontTools $remoteTools nvi iproute2 ack-grep unzip git default-mysql-client sudo make socat dnsutils iputils-ping netcat gnupg ansible python3-wheel"
ARG tools="$editors $fontTools $remoteTools nvi iproute2 ack-grep unzip git default-mysql-client sudo make socat dnsutils iputils-ping netcat-openbsd gnupg ansible python3-wheel"
ARG RUNTIME_PACKAGE_DEPS="$libs $tools msmtp bc locales"


Expand Down

0 comments on commit d99c4e1

Please sign in to comment.