Skip to content

Commit

Permalink
Merge pull request #3 from ITISFoundation/path-notes
Browse files Browse the repository at this point in the history
Regenerate pipeline artefacts
  • Loading branch information
GitHK authored Dec 2, 2024
2 parents 8d362af + 241fb62 commit 34897d5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions .github/workflows/check-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ COPY --chown=$NB_UID:$NB_GID src /src

EXPOSE 8888

ENTRYPOINT [ "/bin/bash", "/docker/entrypoint.bash" ]
ENTRYPOINT [ "/bin/bash", "/docker/entrypoint.bash" ]
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 34897d5

Please sign in to comment.