Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update \
jq apt-transport-https ca-certificates gnupg-agent \
software-properties-common bash-completion python3-pip make libbz2-dev \
libreadline-dev libsqlite3-dev wget llvm libncurses5-dev libncursesw5-dev \
xz-utils tk-dev liblzma-dev netcat ruby-full build-essential zlib1g-dev \
xz-utils tk-dev liblzma-dev netcat-traditional ruby-full build-essential zlib1g-dev \
&& apt remove -y openjdk-8-jdk-headless openjdk-8-jre-headless openjdk-8-jre

# install aws stuff
Expand Down
29 changes: 10 additions & 19 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
"source=${env:HOME}${env:USERPROFILE}/.ssh,target=/home/vscode/.ssh,type=bind",
"source=${env:HOME}${env:USERPROFILE}/.gnupg,target=/home/vscode/.gnupg,type=bind"
],
// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
"version": "latest",
"moby": "true",
"installDockerBuildx": "true"
}
},
"customizations": {
"vscode": {
"extensions": [
Expand Down Expand Up @@ -61,16 +53,15 @@
}
}
},
"remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" },
"postCreateCommand": "rm -f ~/.docker/config.json; git config --global --add safe.directory /workspaces/eps-FHIR-validator-lambda; make install"
// "features": {},
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": ""
// Configure tool-specific properties.
// "customizations": {},
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
"remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" },
"postAttachCommand": "docker build -f https://raw.githubusercontent.com/NHSDigital/eps-workflow-quality-checks/refs/tags/v4.0.4/dockerfiles/nhsd-git-secrets.dockerfile -t git-secrets . && poetry run pre-commit install --install-hooks -f",
"features": {
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
"version": "latest",
"moby": "true",
"installDockerBuildx": "true"
},
"ghcr.io/devcontainers/features/github-cli:1": {}
}
}

26 changes: 20 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,40 +19,54 @@ updates:
# default location of `.github/workflows`
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
day: "friday"
time: "18:00" # UTC
open-pull-requests-limit: 20
commit-message:
prefix: "Upgrade: [dependabot] - "


###################################
# Java workspace ##################
###################################
- package-ecosystem: "maven"
directory: "/"
rebase-strategy: "disabled"
schedule:
interval: "daily"
interval: "weekly"
day: "friday"
time: "18:00" # UTC
open-pull-requests-limit: 20
commit-message:
prefix: "Upgrade: [dependabot] - "


###################################
# Poetry #########################
###################################
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "daily"
versioning-strategy: increase
interval: "weekly"
day: "friday"
time: "18:00" # UTC
open-pull-requests-limit: 20
commit-message:
prefix: "Upgrade: [dependabot] - "
versioning-strategy: increase


###################################
# NPM workspace ##################
###################################
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
versioning-strategy: increase
interval: "weekly"
day: "friday"
time: "18:00" # UTC
open-pull-requests-limit: 20
commit-message:
prefix: "Upgrade: [dependabot] - "
versioning-strategy: increase
Loading