Skip to content

Commit

Permalink
Merge pull request #181 from shyim/create-pull-request/patch
Browse files Browse the repository at this point in the history
Changes by create-pull-request action
  • Loading branch information
shyim authored Nov 7, 2024
2 parents 14876b2 + 557445d commit 62aed41
Show file tree
Hide file tree
Showing 21 changed files with 221 additions and 221 deletions.
28 changes: 14 additions & 14 deletions .circleci/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ jobs:

- run: echo "$GHCR_PASSWORD" | docker login ghcr.io -u shyim --password-stdin

- run: docker build -t ghcr.io/shyim/shopware-nginx:8.2-arm64 -t ghcr.io/shyim/shopware-nginx:8.2.24-arm64 -f nginx/8.2/Dockerfile .
- run: docker build -t ghcr.io/shyim/shopware-nginx:8.2-arm64 -t ghcr.io/shyim/shopware-nginx:8.2.25-arm64 -f nginx/8.2/Dockerfile .

- run: docker push ghcr.io/shyim/shopware-nginx:8.2-arm64

- run: docker push ghcr.io/shyim/shopware-nginx:8.2.24-arm64
- run: docker push ghcr.io/shyim/shopware-nginx:8.2.25-arm64

php82-amd64:
machine:
Expand All @@ -64,11 +64,11 @@ jobs:

- run: echo "$GHCR_PASSWORD" | docker login ghcr.io -u shyim --password-stdin

- run: docker build -t ghcr.io/shyim/shopware-nginx:8.2-amd64 -t ghcr.io/shyim/shopware-nginx:8.2.24-amd64 -f nginx/8.2/Dockerfile .
- run: docker build -t ghcr.io/shyim/shopware-nginx:8.2-amd64 -t ghcr.io/shyim/shopware-nginx:8.2.25-amd64 -f nginx/8.2/Dockerfile .

- run: docker push ghcr.io/shyim/shopware-nginx:8.2-amd64

- run: docker push ghcr.io/shyim/shopware-nginx:8.2.24-amd64
- run: docker push ghcr.io/shyim/shopware-nginx:8.2.25-amd64

php83-arm64:
machine:
Expand All @@ -80,11 +80,11 @@ jobs:

- run: echo "$GHCR_PASSWORD" | docker login ghcr.io -u shyim --password-stdin

- run: docker build -t ghcr.io/shyim/shopware-nginx:8.3-arm64 -t ghcr.io/shyim/shopware-nginx:8.3.12-arm64 -f nginx/8.3/Dockerfile .
- run: docker build -t ghcr.io/shyim/shopware-nginx:8.3-arm64 -t ghcr.io/shyim/shopware-nginx:8.3.13-arm64 -f nginx/8.3/Dockerfile .

- run: docker push ghcr.io/shyim/shopware-nginx:8.3-arm64

- run: docker push ghcr.io/shyim/shopware-nginx:8.3.12-arm64
- run: docker push ghcr.io/shyim/shopware-nginx:8.3.13-arm64

php83-amd64:
machine:
Expand All @@ -96,11 +96,11 @@ jobs:

- run: echo "$GHCR_PASSWORD" | docker login ghcr.io -u shyim --password-stdin

- run: docker build -t ghcr.io/shyim/shopware-nginx:8.3-amd64 -t ghcr.io/shyim/shopware-nginx:8.3.12-amd64 -f nginx/8.3/Dockerfile .
- run: docker build -t ghcr.io/shyim/shopware-nginx:8.3-amd64 -t ghcr.io/shyim/shopware-nginx:8.3.13-amd64 -f nginx/8.3/Dockerfile .

- run: docker push ghcr.io/shyim/shopware-nginx:8.3-amd64

- run: docker push ghcr.io/shyim/shopware-nginx:8.3.12-amd64
- run: docker push ghcr.io/shyim/shopware-nginx:8.3.13-amd64


merge-manifest:
Expand All @@ -119,21 +119,21 @@ jobs:

- run: docker manifest push ghcr.io/shyim/shopware-nginx:8.1.30

- run: docker manifest create ghcr.io/shyim/shopware-nginx:8.2 --amend ghcr.io/shyim/shopware-nginx:8.2.24-amd64 --amend ghcr.io/shyim/shopware-nginx:8.2.24-arm64
- run: docker manifest create ghcr.io/shyim/shopware-nginx:8.2 --amend ghcr.io/shyim/shopware-nginx:8.2.25-amd64 --amend ghcr.io/shyim/shopware-nginx:8.2.25-arm64

- run: docker manifest create ghcr.io/shyim/shopware-nginx:8.2.24 --amend ghcr.io/shyim/shopware-nginx:8.2.24-amd64 --amend ghcr.io/shyim/shopware-nginx:8.2.24-arm64
- run: docker manifest create ghcr.io/shyim/shopware-nginx:8.2.25 --amend ghcr.io/shyim/shopware-nginx:8.2.25-amd64 --amend ghcr.io/shyim/shopware-nginx:8.2.25-arm64

- run: docker manifest push ghcr.io/shyim/shopware-nginx:8.2

- run: docker manifest push ghcr.io/shyim/shopware-nginx:8.2.24
- run: docker manifest push ghcr.io/shyim/shopware-nginx:8.2.25

- run: docker manifest create ghcr.io/shyim/shopware-nginx:8.3 --amend ghcr.io/shyim/shopware-nginx:8.3.12-amd64 --amend ghcr.io/shyim/shopware-nginx:8.3.12-arm64
- run: docker manifest create ghcr.io/shyim/shopware-nginx:8.3 --amend ghcr.io/shyim/shopware-nginx:8.3.13-amd64 --amend ghcr.io/shyim/shopware-nginx:8.3.13-arm64

- run: docker manifest create ghcr.io/shyim/shopware-nginx:8.3.12 --amend ghcr.io/shyim/shopware-nginx:8.3.12-amd64 --amend ghcr.io/shyim/shopware-nginx:8.3.12-arm64
- run: docker manifest create ghcr.io/shyim/shopware-nginx:8.3.13 --amend ghcr.io/shyim/shopware-nginx:8.3.13-amd64 --amend ghcr.io/shyim/shopware-nginx:8.3.13-arm64

- run: docker manifest push ghcr.io/shyim/shopware-nginx:8.3

- run: docker manifest push ghcr.io/shyim/shopware-nginx:8.3.12
- run: docker manifest push ghcr.io/shyim/shopware-nginx:8.3.13

workflows:
build-base-image:
Expand Down
344 changes: 172 additions & 172 deletions .github/workflows/shopware.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion index_php.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"8.1":"8.1.30","8.2":"8.2.24","8.3":"8.3.12"}
{"8.1":"8.1.30","8.2":"8.2.25","8.3":"8.3.13"}
2 changes: 1 addition & 1 deletion nginx/8.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.2.24-fpm-alpine
FROM php:8.2.25-fpm-alpine

ENV APP_ENV=prod \
LOCK_DSN=flock \
Expand Down
2 changes: 1 addition & 1 deletion nginx/8.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3.12-fpm-alpine
FROM php:8.3.13-fpm-alpine

ENV APP_ENV=prod \
LOCK_DSN=flock \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.10
RUN shopware-cli project create shop 6.5.8.15

FROM ghcr.io/shyim/shopware-nginx:8.1.30

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.10" > /shopware_version && \
echo "6.5.8.15" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.12
RUN shopware-cli project create shop 6.5.8.15

FROM ghcr.io/shyim/shopware-nginx:8.1.30

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.12" > /shopware_version && \
echo "6.5.8.15" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.9
RUN shopware-cli project create shop 6.6.7.1

FROM ghcr.io/shyim/shopware-nginx:8.1.30

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.9" > /shopware_version && \
echo "6.6.7.1" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.9
RUN shopware-cli project create shop 6.6.7.1

FROM ghcr.io/shyim/shopware-nginx:8.1.30

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.9" > /shopware_version && \
echo "6.6.7.1" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.12
RUN shopware-cli project create shop 6.6.8.0

FROM ghcr.io/shyim/shopware-nginx:8.1.30

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.12" > /shopware_version && \
echo "6.6.8.0" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.10
RUN shopware-cli project create shop 6.6.8.0

FROM ghcr.io/shyim/shopware-nginx:8.1.30

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.10" > /shopware_version && \
echo "6.6.8.0" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.11
RUN shopware-cli project create shop 6.6.8.1

FROM ghcr.io/shyim/shopware-nginx:8.1.30

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.11" > /shopware_version && \
echo "6.6.8.1" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.11
RUN shopware-cli project create shop 6.6.8.1

FROM ghcr.io/shyim/shopware-nginx:8.1.30

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.11" > /shopware_version && \
echo "6.6.8.1" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.10
RUN shopware-cli project create shop 6.5.8.15

FROM ghcr.io/shyim/shopware-nginx:8.2.24

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.10" > /shopware_version && \
echo "6.5.8.15" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.12
RUN shopware-cli project create shop 6.5.8.15

FROM ghcr.io/shyim/shopware-nginx:8.2.24

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.12" > /shopware_version && \
echo "6.5.8.15" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.9
RUN shopware-cli project create shop 6.6.7.1

FROM ghcr.io/shyim/shopware-nginx:8.2.24

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.9" > /shopware_version && \
echo "6.6.7.1" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.9
RUN shopware-cli project create shop 6.6.7.1

FROM ghcr.io/shyim/shopware-nginx:8.2.24

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.9" > /shopware_version && \
echo "6.6.7.1" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.12
RUN shopware-cli project create shop 6.6.8.0

FROM ghcr.io/shyim/shopware-nginx:8.2.24

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.12" > /shopware_version && \
echo "6.6.8.0" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.10
RUN shopware-cli project create shop 6.6.8.0

FROM ghcr.io/shyim/shopware-nginx:8.2.24

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.10" > /shopware_version && \
echo "6.6.8.0" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.11
RUN shopware-cli project create shop 6.6.8.1

FROM ghcr.io/shyim/shopware-nginx:8.2.24

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.11" > /shopware_version && \
echo "6.6.8.1" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.8.11
RUN shopware-cli project create shop 6.6.8.1

FROM ghcr.io/shyim/shopware-nginx:8.2.24

Expand All @@ -10,7 +10,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.8.11" > /shopware_version && \
echo "6.6.8.1" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Expand Down

0 comments on commit 62aed41

Please sign in to comment.