Skip to content

Commit 65ec502

Browse files
committed
~
1 parent b28f3a9 commit 65ec502

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ __DAM_URL="https://github.com/alecrabbit/dev-app-makefile"
2424

2525
install_dam_tool:
2626
@echo -e "Installing DAM tool...\n";
27-
@wget -qO- "${__DAM_URL}/archive/refs/heads/dev.tar.gz" | tar -xz \
28-
&& shopt -s dotglob && cp -r dev-app-makefile-dev/* . && shopt -u dotglob \
29-
&& rm -r dev-app-makefile-dev && ./install && make upgrade c=dev
27+
@wget -qO- "${__DAM_URL}/archive/refs/heads/main.tar.gz" | tar -xz \
28+
&& shopt -s dotglob && cp -r dev-app-makefile-main/* . && shopt -u dotglob \
29+
&& rm -r dev-app-makefile-main && ./install && make upgrade c=main
3030

3131
help_dam_tool:
3232
@echo -e "DAM tool help:\n";
33-
@echo " make do_install_dam_tool - install DAM tool";
33+
@echo " make install_dam_tool - install DAM tool";
3434
@echo "";

docker/Dockerfile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ ARG COMPOSER_HOME=/tmp/composer
1616

1717
ARG PHIVE_VERSION_KEY=0x6AF725270AB81E04D79442549D8A98B29B2D5D79
1818

19+
ARG COMPOSER_UNUSED_KEY=0xD969E61026434DFE4D641764F4D32E2C9343B2AE
1920
ARG DEPTRAC_VERSION_KEY=0x41DDE07547459FAECFA17813B8F640134AB1782E
21+
ARG ERGEBNIS_COMPOSER_NORMALIZE_KEY=0x0FDE18AE1D09E19F60F6B1CBC00543248C87FB13
22+
ARG PHP_CODESNIFFER_KEY=0xA972B9ABB95D0B760B51442231C7E470E2138192
2023
ARG PHP_CS_FIXER_VERSION_KEY=0xBBAB5DF0A0D6672989CF1869E82B2FB314E9906E
2124
ARG PHPLOC_VERSION_KEY=0x4AA394086372C20A
2225
ARG PSALM_VERSION_KEY=0x2DE50EB60C013FFFA831040D12CE0F1D262429A5
23-
ARG ERGEBNIS_COMPOSER_NORMALIZE_KEY=0x0FDE18AE1D09E19F60F6B1CBC00543248C87FB13
2426

2527
ARG COMPOSER_PACKAGES="\
28+
nunomaduro/phpinsights \
2629
"
2730

2831
ARG TOOLS="\
@@ -151,6 +154,7 @@ RUN set -eux \
151154
/home/user \
152155
${COMPOSER_HOME} \
153156
&& chmod 777 /home/user ${COMPOSER_HOME} \
157+
&& composer global config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true \
154158
&& composer --no-interaction global --prefer-stable \
155159
--optimize-autoloader require \
156160
${COMPOSER_PACKAGES} \
@@ -166,12 +170,18 @@ RUN set -eux \
166170
&& mv phive.phar /usr/local/bin/phive \
167171
## // install PHPLOC
168172
&& phive install phploc --trust-gpg-keys ${PHPLOC_VERSION_KEY} --target /usr/local/bin \
173+
## // install composer-unused \
174+
&& phive install composer-unused --trust-gpg-keys ${COMPOSER_UNUSED_KEY} --target /usr/local/bin \
169175
## // install deptrac \
170176
&& phive install deptrac --trust-gpg-keys ${DEPTRAC_VERSION_KEY} --target /usr/local/bin \
171177
## // install php-cs-fixer \
172178
&& phive install php-cs-fixer --trust-gpg-keys ${PHP_CS_FIXER_VERSION_KEY} --target /usr/local/bin \
173179
## // install psalm \
174180
&& phive install psalm --trust-gpg-keys ${PSALM_VERSION_KEY} --target /usr/local/bin \
181+
## // install phpcs \
182+
&& phive install phpcs --trust-gpg-keys ${PHP_CODESNIFFER_KEY} --target /usr/local/bin \
183+
## // install phpcbf \
184+
&& phive install phpcbf --trust-gpg-keys ${PHP_CODESNIFFER_KEY} --target /usr/local/bin \
175185
## // install ergebnis/composer-normalize \
176186
&& phive install ergebnis/composer-normalize \
177187
--trust-gpg-keys ${ERGEBNIS_COMPOSER_NORMALIZE_KEY} --target /usr/local/bin \

docker/config/php/memory.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
memory_limit=256M

docker/config/php/timezone.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
;Explicitly set timezone
2-
date.timezone ="UTC"
2+
date.timezone="UTC"

0 commit comments

Comments
 (0)