Skip to content

Commit

Permalink
[CARD-2980] Clear up old Jenkins CI config (#25)
Browse files Browse the repository at this point in the history
  • Loading branch information
ben-challis authored Jun 28, 2021
1 parent 767bb22 commit cf32a46
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 48 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ EXEC_SHELL = /bin/sh
EXEC_USER = app

DOCKER_COMPOSE = docker-compose \
-f ${DIR}/ci/docker-compose-tests.yaml \
-f ${DIR}/ci/docker-compose-dev.yaml \
-f ${DIR}/local/docker-compose.yaml \
--project-directory $(DIR) \
-p ${PROJECT_NAME}

Expand Down Expand Up @@ -37,7 +36,7 @@ shell:
$(DOCKER_COMPOSE) exec -u $(EXEC_USER) $(CONTAINER) $(EXEC_SHELL)

build: init
DOCKER_BUILDKIT=1 docker build --ssh default -f "${DIR}/Dockerfile.php-cli" -t $(PROJECT_NAME)_$(CONTAINER):latest --target base .
DOCKER_BUILDKIT=1 docker build --ssh default -f "${DIR}/local/Dockerfile.php-cli" -t $(PROJECT_NAME)_$(CONTAINER):latest --target base .

clean:
@$(DOCKER_COMPOSE) down -v --rmi local
Expand Down
10 changes: 0 additions & 10 deletions ci/docker-compose-tests.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions ci/run.sh

This file was deleted.

3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@
"@tests:unit",
"@tests:integration",
"@code-style:check"
],
"run-ci": [
"ci/run.sh"
]
}
}
10 changes: 1 addition & 9 deletions Dockerfile.php-cli → local/Dockerfile.php-cli
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ COPY --from=composer:2.1.3 /usr/bin/composer /usr/bin/composer
RUN apk add --no-cache git openssh \
&& mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts

COPY ci/php_conf.ini /usr/local/etc/php/conf.d/999-custom.ini
COPY local/php_conf.ini /usr/local/etc/php/conf.d/999-custom.ini

WORKDIR /app

FROM base as ci

COPY . /app

RUN --mount=type=ssh composer install --prefer-dist --no-progress -n --ansi \
&& apk del openssh git \
&& composer clear-cache --ansi -n
4 changes: 2 additions & 2 deletions ci/docker-compose-dev.yaml → local/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ services:
entrypoint: "/bin/sh"
tty: true
build:
context: ..
context: .
dockerfile: Dockerfile.php-cli
target: base
environment:
SSH_AUTH_SOCK: "${SSH_AUTH_SOCK}"
volumes:
- ".:/app"
- "..:/app"
- "${SSH_AUTH_SOCK}:${SSH_AUTH_SOCK}:ro"
File renamed without changes.

0 comments on commit cf32a46

Please sign in to comment.