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

Jump to bottom

Update to 4.1.1 and 5.0.0-beta.4 #145

Merged
merged 4 commits into from
May 3, 2024
Merged

Update to 4.1.1 and 5.0.0-beta.4 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b0010b
Update to 4.1.1 and 5.0.0-beta.4
asbiin May 3, 2024
3b0dc27
update
asbiin May 3, 2024
1541894
update
asbiin May 3, 2024
2085f8b
update
asbiin May 3, 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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:


env:
bashbrew-version: 0.1.9
bashbrew-version: 0.1.12

jobs:
build:
Expand All @@ -24,9 +24,9 @@ jobs:
release: [4, 5]
include:
- release: 4
php-version: 8.1
- release: 5
php-version: 8.2
- release: 5
php-version: 8.3

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:

env:
bashbrew-version: 0.1.9
bashbrew-version: 0.1.12


jobs:
Expand Down
2 changes: 1 addition & 1 deletion .templates/scripts/5/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
fi

# Run migrations
${ARTISAN} monica:waitfordb
${ARTISAN} waitfordb
${ARTISAN} monica:setup --force -vv

fi
Expand Down
10 changes: 5 additions & 5 deletions 4/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1-apache
FROM php:8.2-apache

# opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL org.opencontainers.image.authors="Alexis Saettler <[email protected]>" \
Expand Down Expand Up @@ -58,7 +58,7 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install APCu-5.1.23; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.2; \
\
Expand Down Expand Up @@ -148,9 +148,9 @@ RUN set -ex; \
WORKDIR /var/www/html

# Define Monica version
ENV MONICA_VERSION v4.0.0
LABEL org.opencontainers.image.revision="e1a3e1315b1a92a5ff0ccab6c22ba9ded77a599e" \
org.opencontainers.image.version="v4.0.0"
ENV MONICA_VERSION v4.1.1
LABEL org.opencontainers.image.revision="50c266f7beb9d8fe6cd8c8929a759529275143f4" \
org.opencontainers.image.version="v4.1.1"

RUN set -ex; \
fetchDeps=" \
Expand Down
10 changes: 5 additions & 5 deletions 4/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1-fpm-alpine
FROM php:8.2-fpm-alpine

# opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL org.opencontainers.image.authors="Alexis Saettler <[email protected]>" \
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN set -ex; \
soap \
; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install APCu-5.1.23; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.2; \
\
Expand Down Expand Up @@ -111,9 +111,9 @@ RUN set -ex; \
WORKDIR /var/www/html

# Define Monica version
ENV MONICA_VERSION v4.0.0
LABEL org.opencontainers.image.revision="e1a3e1315b1a92a5ff0ccab6c22ba9ded77a599e" \
org.opencontainers.image.version="v4.0.0"
ENV MONICA_VERSION v4.1.1
LABEL org.opencontainers.image.revision="50c266f7beb9d8fe6cd8c8929a759529275143f4" \
org.opencontainers.image.version="v4.1.1"

RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
Expand Down
10 changes: 5 additions & 5 deletions 4/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1-fpm
FROM php:8.2-fpm

# opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL org.opencontainers.image.authors="Alexis Saettler <[email protected]>" \
Expand Down Expand Up @@ -58,7 +58,7 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install APCu-5.1.23; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.2; \
\
Expand Down Expand Up @@ -125,9 +125,9 @@ RUN set -ex; \
WORKDIR /var/www/html

# Define Monica version
ENV MONICA_VERSION v4.0.0
LABEL org.opencontainers.image.revision="e1a3e1315b1a92a5ff0ccab6c22ba9ded77a599e" \
org.opencontainers.image.version="v4.0.0"
ENV MONICA_VERSION v4.1.1
LABEL org.opencontainers.image.revision="50c266f7beb9d8fe6cd8c8929a759529275143f4" \
org.opencontainers.image.version="v4.1.1"

RUN set -ex; \
fetchDeps=" \
Expand Down
10 changes: 5 additions & 5 deletions 5/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.2-apache
FROM php:8.3-apache

# opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL org.opencontainers.image.authors="Alexis Saettler <[email protected]>" \
Expand Down Expand Up @@ -58,7 +58,7 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install APCu-5.1.23; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.2; \
\
Expand Down Expand Up @@ -148,9 +148,9 @@ RUN set -ex; \
WORKDIR /var/www/html

# Define Monica version
ENV MONICA_VERSION v5.0.0-beta.3
LABEL org.opencontainers.image.revision="452f59f58cb65097968eb9a6153d7be191fce08d" \
org.opencontainers.image.version="v5.0.0-beta.3"
ENV MONICA_VERSION v5.0.0-beta.4
LABEL org.opencontainers.image.revision="a657ff47feb137450b1ffb6eaf1d98c3e777e57e" \
org.opencontainers.image.version="v5.0.0-beta.4"

RUN set -ex; \
fetchDeps=" \
Expand Down
2 changes: 1 addition & 1 deletion 5/apache/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
fi

# Run migrations
${ARTISAN} monica:waitfordb
${ARTISAN} waitfordb
${ARTISAN} monica:setup --force -vv

fi
Expand Down
10 changes: 5 additions & 5 deletions 5/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.2-fpm-alpine
FROM php:8.3-fpm-alpine

# opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL org.opencontainers.image.authors="Alexis Saettler <[email protected]>" \
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN set -ex; \
soap \
; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install APCu-5.1.23; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.2; \
\
Expand Down Expand Up @@ -111,9 +111,9 @@ RUN set -ex; \
WORKDIR /var/www/html

# Define Monica version
ENV MONICA_VERSION v5.0.0-beta.3
LABEL org.opencontainers.image.revision="452f59f58cb65097968eb9a6153d7be191fce08d" \
org.opencontainers.image.version="v5.0.0-beta.3"
ENV MONICA_VERSION v5.0.0-beta.4
LABEL org.opencontainers.image.revision="a657ff47feb137450b1ffb6eaf1d98c3e777e57e" \
org.opencontainers.image.version="v5.0.0-beta.4"

RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
Expand Down
2 changes: 1 addition & 1 deletion 5/fpm-alpine/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
fi

# Run migrations
${ARTISAN} monica:waitfordb
${ARTISAN} waitfordb
${ARTISAN} monica:setup --force -vv

fi
Expand Down
10 changes: 5 additions & 5 deletions 5/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.2-fpm
FROM php:8.3-fpm

# opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL org.opencontainers.image.authors="Alexis Saettler <[email protected]>" \
Expand Down Expand Up @@ -58,7 +58,7 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install APCu-5.1.23; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.2; \
\
Expand Down Expand Up @@ -125,9 +125,9 @@ RUN set -ex; \
WORKDIR /var/www/html

# Define Monica version
ENV MONICA_VERSION v5.0.0-beta.3
LABEL org.opencontainers.image.revision="452f59f58cb65097968eb9a6153d7be191fce08d" \
org.opencontainers.image.version="v5.0.0-beta.3"
ENV MONICA_VERSION v5.0.0-beta.4
LABEL org.opencontainers.image.revision="a657ff47feb137450b1ffb6eaf1d98c3e777e57e" \
org.opencontainers.image.version="v5.0.0-beta.4"

RUN set -ex; \
fetchDeps=" \
Expand Down
2 changes: 1 addition & 1 deletion 5/fpm/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
fi

# Run migrations
${ARTISAN} monica:waitfordb
${ARTISAN} waitfordb
${ARTISAN} monica:setup --force -vv

fi
Expand Down
2 changes: 1 addition & 1 deletion generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ latest="$(curl -fsSL 'https://api.github.com/repos/monicahq/monica/releases/late

# releases=( */ )
# releases=( "${releases[@]%/}" )
releases=( 4 )
releases=( 4 5 )

for release in "${releases[@]}"; do

Expand Down
6 changes: 3 additions & 3 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ variants=(
)

declare -A php_version=(
[default]='8.2'
[5]='8.2'
[4]='8.1'
[default]='8.3'
[5]='8.3'
[4]='8.2'
)

declare -A cmd=(
Expand Down