Add git to dev container

This commit is contained in:
Michael Weimann 2023-01-29 17:02:53 +01:00 committed by Igor Scheller
parent 21eafb7d26
commit 321fbc82fc
4 changed files with 6 additions and 2 deletions

1
.gitignore vendored
View File

@ -41,3 +41,4 @@ _vimrc_local.vim
/public/assets /public/assets
/package-lock.json /package-lock.json
/yarn-error.log /yarn-error.log
/.yarn-cache

View File

@ -150,6 +150,9 @@ yarn lint:
image: node:alpine image: node:alpine
stage: validate stage: validate
script: script:
# Install git, so that tools can use .gitignore.
# Not done in before_script because of <<: *use_yarn.
- apk add --no-cache git
- yarn lint - yarn lint
# #

View File

@ -25,6 +25,6 @@ ENV TRUSTED_PROXIES 10.0.0.0/8,::ffff:10.0.0.0/8,\
# Contains all tools required to build / manage the system # Contains all tools required to build / manage the system
FROM es_base AS es_workspace FROM es_base AS es_workspace
RUN echo 'memory_limit = 512M' > /usr/local/etc/php/conf.d/docker-php.ini RUN echo 'memory_limit = 512M' > /usr/local/etc/php/conf.d/docker-php.ini
RUN apk add --no-cache gettext nodejs npm yarn RUN apk add --no-cache gettext git nodejs npm yarn
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
ENTRYPOINT php -r 'sleep(PHP_INT_MAX);' ENTRYPOINT php -r 'sleep(PHP_INT_MAX);'

View File

@ -12,7 +12,7 @@
"lint": "yarn lint:eslint && yarn lint:prettier && yarn lint:ec", "lint": "yarn lint:eslint && yarn lint:prettier && yarn lint:ec",
"lint:eslint": "eslint .", "lint:eslint": "eslint .",
"lint:prettier": "prettier --check resources/assets", "lint:prettier": "prettier --check resources/assets",
"lint:ec": "ec --exclude \"node_modules|vendor|public/assets|.git\"", "lint:ec": "ec",
"lint:fix": "yarn lint:fix:eslint && yarn lint:fix:prettier", "lint:fix": "yarn lint:fix:eslint && yarn lint:fix:prettier",
"lint:fix:eslint": "eslint --fix .", "lint:fix:eslint": "eslint --fix .",
"lint:fix:prettier": "prettier --write resources/assets" "lint:fix:prettier": "prettier --write resources/assets"