Skip to content

Commit

Permalink
Updates: DebugKit version
Browse files Browse the repository at this point in the history
  • Loading branch information
b23prodtm committed Feb 21, 2021
1 parent 4b3bcee commit de83893
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.armhf
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ ENV MIGRATE_OPTION ${MIGRATE_OPTION:-'-v'}

# Use the default production configuration
#COPY $PHP_INI_DIR/php.ini-production $PHP_INI_DIR/php.ini
RUN [ "cross-build-start" ]
# RUN [ "cross-build-start" ]
RUN install_packages \
git \
openssh-client \
Expand Down Expand Up @@ -126,7 +126,7 @@ RUN ./deploy.sh ${DKR_ARCH} --nobuild --exit \
# just containers configuration
COPY etc /etc

RUN [ "cross-build-end" ]
# RUN [ "cross-build-end" ]

ENTRYPOINT ./migrate-database.sh -o -u -i ${MIGRATE_OPTION} \
&& ./migrate-database.sh -o -u ${MIGRATE_OPTION} --connection=test && /init
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@
},
"require": {
"php": "^5.6 || ^7 || ^8",
"cakephp/debug_kit": "2.2.*",
"cakephp/debug_kit": "2.2.9",
"betothreeprod/markdown-plugin": "dev-master",
"betothreeprod/updateshell": "dev-development",
"cakephp/datasources": "2.3.x-dev"
"cakephp/datasources": "2.3.x-dev",
"opis/closure": "^3.5"
},
"suggest": {
"ext-openssl": "You need to install ext-openssl or ext-mcrypt to use AES-256 encryption",
Expand Down
4 changes: 2 additions & 2 deletions deployment/images/apache-php7/Dockerfile.armhf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# S6 Overlay: https://github.com/smebberson/docker-alpine/blob/master/alpine-apache/Dockerfile
#
FROM balenalib/raspberrypi3-alpine-node:run
RUN [ "cross-build-start" ]
# RUN [ "cross-build-start" ]
ARG PHP_LIB
ENV PHP_LIB ${PHP_LIB:-7}

Expand Down Expand Up @@ -103,4 +103,4 @@ RUN chmod g+xs /bin/systemctl

ENTRYPOINT /init
RUN node -v && npm -v
RUN [ "cross-build-end" ]
# RUN [ "cross-build-end" ]

0 comments on commit de83893

Please sign in to comment.