opdavies/oliverdavies.uk-drupal-old
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

build: move Dockerfile

Browse source
This commit is contained in:
Oliver Davies 2021-12-28 01:28:23 +00:00
parent 7e744f6b58
commit 21e36c47b9
3 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
tools/docker/Dockerfile → Dockerfile
View file

3
docker-compose.yaml
View file

@ -8,7 +8,6 @@ volumes:
services: services:
nginx: nginx:
build: build:
dockerfile: tools/docker/Dockerfile
context: . context: .
target: nginx target: nginx
volumes: volumes:
@ -25,7 +24,6 @@ services:
php: php:
build: build:
context: . context: .
dockerfile: tools/docker/Dockerfile
target: dev target: dev
image: ghcr.io/opdavies/oliverdavies-uk-php:7.4-alpine image: ghcr.io/opdavies/oliverdavies-uk-php:7.4-alpine
volumes: volumes:
@ -52,7 +50,6 @@ services:
node: node:
build: build:
context: . context: .
dockerfile: tools/docker/Dockerfile
target: assets target: assets
image: ghcr.io/opdavies/oliverdavies-uk-assets:node-14 image: ghcr.io/opdavies/oliverdavies-uk-assets:node-14
working_dir: /node working_dir: /node

2
run
View file

@ -91,7 +91,7 @@ function task:lint:dockerfile {
hadolint/hadolint hadolint \ hadolint/hadolint hadolint \
--ignore DL3008 \ --ignore DL3008 \
--ignore DL3022 \ --ignore DL3022 \
"${@}" - < tools/docker/Dockerfile "${@}" - < Dockerfile
} }
function task:test:functional { function task:test:functional {