diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0bd0700..7b5fea5 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -3,7 +3,7 @@ # Order is important. The last matching pattern has the most precedence. # SEE https://docs.github.com/en/free-pro-team@latest/github/creating-cloning-and-archiving-repositories/about-code-owners#example-of-a-codeowners-file -* @elisabettai +* @GitHK # NOTE: '/' denotes the root of the repository /src/templates/index.html @GitHK diff --git a/.github/workflows/check-image.yml b/.github/workflows/check-image.yml index b6bc5b3..5e6a789 100644 --- a/.github/workflows/check-image.yml +++ b/.github/workflows/check-image.yml @@ -9,14 +9,14 @@ jobs: - name: Checkout repo content uses: actions/checkout@v2 - name: ooil version - uses: docker://itisfoundation/ci-service-integration-library:v1.0.1-dev-43 + uses: docker://itisfoundation/ci-service-integration-library:v2.0.5 with: args: ooil --version - - name: Assemble docker-compose spec - uses: docker://itisfoundation/ci-service-integration-library:v1.0.1-dev-43 + - name: Assemble docker compose spec + uses: docker://itisfoundation/ci-service-integration-library:v2.0.5 with: args: ooil compose - name: Build all images if multiple - uses: docker://itisfoundation/ci-service-integration-library:v1.0.1-dev-43 + uses: docker://itisfoundation/ci-service-integration-library:v2.0.5 with: - args: docker-compose build + args: docker compose build diff --git a/Dockerfile b/Dockerfile index ba301eb..6f8927a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,4 +14,4 @@ COPY --chown=$NB_UID:$NB_GID src /src EXPOSE 8888 -ENTRYPOINT [ "/bin/bash", "/docker/entrypoint.bash" ] \ No newline at end of file +ENTRYPOINT [ "/bin/bash", "/docker/entrypoint.bash" ] diff --git a/Makefile b/Makefile index 05d4c6a..ea41e92 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ define _bumpversion # upgrades as $(subst $(1),,$@) version, commits and tags @docker run -it --rm -v $(PWD):/${DOCKER_IMAGE_NAME} \ -u $(shell id -u):$(shell id -g) \ - itisfoundation/ci-service-integration-library:v1.0.1-dev-43 \ + itisfoundation/ci-service-integration-library:v2.0.5 \ sh -c "cd /${DOCKER_IMAGE_NAME} && bump2version --verbose --list --config-file $(1) $(subst $(2),,$@)" endef @@ -50,16 +50,16 @@ version-patch version-minor version-major: .bumpversion.cfg ## increases service compose-spec: ## runs ooil to assemble the docker-compose.yml file @docker run -it --rm -v $(PWD):/${DOCKER_IMAGE_NAME} \ -u $(shell id -u):$(shell id -g) \ - itisfoundation/ci-service-integration-library:v1.0.1-dev-43 \ + itisfoundation/ci-service-integration-library:v2.0.5 \ sh -c "cd /${DOCKER_IMAGE_NAME} && ooil compose" build: | compose-spec ## build docker image - docker-compose build + docker compose build # To test built service locally ------------------------------------------------------------------------- .PHONY: run-local run-local: ## runs image with local configuration - docker-compose --file docker-compose-local.yml up + docker compose --file docker-compose-local.yml up .PHONY: publish-local publish-local: ## push to local throw away registry to test integration