Skip to content

Commit

Permalink
Updating alpine to the latest
Browse files Browse the repository at this point in the history
- Updated PHP to 8.1
- Updated Java to 17 LTS (To get around deadlocks: docker/for-mac#5590)
- Updated Code Server to 4.8.3
- Updated Matomo to 4.12.3
- Updated to Alpaca 2.2.0
- Updated to s6-overlay 3.1.2.1
- Overhaul of s6-overlay to support the major upgrade
- Moved to Alpaca standalone jar
- Removed the demo image as it is unmaintained and doesn't support php 8.1
- Removed Karaf image as it is no longer needed.
- Created test image for testing changes to isle-buildkit (includes sample content)
- Added Automated integration tests for a full site
- Updated documentation
  • Loading branch information
nigelgbanks committed Nov 28, 2022
1 parent 4b412c7 commit 0678b22
Show file tree
Hide file tree
Showing 665 changed files with 63,657 additions and 5,732 deletions.
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# EditorConfig: https://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4

# Secrets and defaults should not have a newline at their eof.
[secrets/*,defaults/*]
end_of_line = lf
insert_final_newline = false
indent_size = 0
37 changes: 37 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Provide environment variables for configuring docker-compose, *not* the
# containers themselves.
#
# Note that this is simple string assignment, quotes should *not* be used.
# Multiple lines or commands, or bash syntax will not work.
#
# References:
# - https://docs.docker.com/compose/env-file/
# - https://docs.docker.com/compose/reference/envvars/
COMPOSE_PROJECT_NAME=isle-buildkit

# Use buildkit when building images.
COMPOSE_DOCKER_CLI_BUILD=1
DOCKER_BUILDKIT=1

# Required for traefik on OSX (inconsistent behavior).
DOCKER_CLIENT_TIMEOUT=120
COMPOSE_HTTP_TIMEOUT=120

# The consistency requirements for bind mounts; one of:
#
# - consistent: Full consistency. The container runtime and the host maintain an identical view of the mount at all times.
# - cached: The host's view of the mount is authoritative. There may be delays before updates made on the host are visible within a container.
# - delegated: The container runtime's view of the mount is authoritative. There may be delays before updates made in a container are visible on the host.
#
# Note that using 'consistent' can be very slow.
CONSISTENCY=delegated

# The Docker image repository, to use for isle-buildkit images.
#
# "local" is produced by building isle-buildkit manually
# "islandora" is pulled from DockerHub.
#
REPOSITORY=registry.islandora.dev:5000

# The version of the isle-buildkit images to use.
TAG=latest
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
scratch
scratch.md
volumes
/docker-compose.yml
29 changes: 29 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# We do not want to modify whitespace or add newlines to specific files, namely:
# - Certs
# - Keys
# - Patches (Should match 100% the source from which they were derived)
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
hooks:
- id: check-case-conflict
- id: check-json
- id: check-shebang-scripts-are-executable
- id: check-symlinks
- id: check-yaml
- id: end-of-file-fixer
exclude: &format-exclude secrets/.*|defaults/.*|cert.pem.tmpl|private.key.tmpl|rootCA.pem.tmpl|admin.private.key.tmpl|admin.public.key.tmpl|private.key.tmpl|public.key.tmpl|.patch
- id: mixed-line-ending
- id: trailing-whitespace
exclude: *format-exclude
- repo: https://github.com/gruntwork-io/pre-commit
rev: v0.1.17
hooks:
- id: shellcheck
exclude: &shell-exclude gradlew|.patch
- repo: https://github.com/jumanjihouse/pre-commit-hooks
rev: 3.0.0
hooks:
- id: shfmt
files: finish
exclude: *shell-exclude
30 changes: 29 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,53 @@
"composer": "shellscript"
},
"cSpell.words": [
"abuild",
"autoconfigure",
"autowire",
"binarystorage",
"Blazegraph",
"buildkit",
"CAROOT",
"catchable",
"classpath",
"Confd",
"confdir",
"contenv",
"crayfits",
"crond",
"elif",
"execline",
"execlineb",
"fastcgi",
"FCREPO",
"filesize",
"getenv",
"gradlew",
"homarus",
"islandora",
"JNA",
"jsonld",
"karaf",
"KEEPALIVE",
"libc",
"Matomo",
"mkcert",
"MODESHAPE",
"mysqld",
"nativeplatform",
"nocopy",
"oneshot",
"POSTGRESQL",
"proxied",
"ripgrep",
"rootfs",
"shellcheck",
"shfmt",
"SIGTERM",
"subsite",
"svwait",
"tmpl",
"traefik",
"xdebug"
]
}
}
Loading

0 comments on commit 0678b22

Please sign in to comment.