Skip to content

Commit

Permalink
chore(deps): updated node, java, fhir terminal and re-ordered Dockerf…
Browse files Browse the repository at this point in the history
…ile (#195)

* chore(deps): updated node, java, fhir terminal and re-ordered Dockerfile

* ci: fix perms

* downgrade fhir terminal
  • Loading branch information
chgl authored Nov 22, 2024
1 parent 8d9e829 commit 4436296
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
build:
uses: miracum/.github/.github/workflows/standard-build.yaml@0549971ecda7c7415b7e885117576981b4b54ed2 # v1.12.8
permissions:
contents: read
contents: write
id-token: write
packages: write
pull-requests: write
Expand Down
10 changes: 0 additions & 10 deletions .renovaterc.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["github>miracum/.github//renovate/default"],
"customManagers": [
{
"customType": "regex",
"description": "Update _VERSION variables in Dockerfiles",
"fileMatch": ["(^|/|\\.)Dockerfile$"],
"matchStrings": [
"# renovate: datasource=(?<datasource>[a-z-]+?)(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\s(?:ENV|ARG) .+?_VERSION=(?<currentValue>.+?)\\s"
]
}
],
"packageRules": [
{
"matchUpdateTypes": ["minor", "patch", "pin", "digest"],
Expand Down
24 changes: 16 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
FROM docker.io/library/eclipse-temurin:11-jre@sha256:a271604505e739df02cf59601bcd5cb352201f38b2e0b20ecd8025e77492c960
FROM docker.io/library/eclipse-temurin:21-jre-noble@sha256:ca8122733ba6fb35e7e20da404c7c72d13c38097d126bd05794f0bdb15520441
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
WORKDIR /opt/ig-build-tools
ENV NO_UPDATE_NOTIFIER=true \
NODE_ENV=production \
JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" \
NODE_MAJOR=20 \
NODE_MAJOR=22 \
DOTNET_CLI_TELEMETRY_OPTOUT=1 \
PATH="$PATH:/opt/ig-build-tools/node_modules/.bin:/root/.dotnet/tools"

# hadolint ignore=DL3008,DL3028
RUN <<EOF
set -e
apt-get update
apt-get install -y --no-install-recommends ca-certificates curl gnupg sshpass ruby-full build-essential zlib1g-dev dotnet-sdk-6.0
apt-get install -y --no-install-recommends ca-certificates curl gnupg sshpass ruby-full build-essential zlib1g-dev dotnet-sdk-8.0
mkdir -p /etc/apt/keyrings
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
Expand All @@ -21,27 +23,33 @@ apt-get clean
rm -rf /var/lib/apt/lists/*

gem install jekyll bundler

dotnet tool install --global Firely.Terminal --version 3.2.0-beta-1
fhir --version
EOF

COPY package*.json .
RUN <<EOF
set -e
npm clean-install
sushi --version
EOF

# renovate: datasource=nuget depName=Firely.Terminal packageName=Firely.Terminal
ARG FIRELY_TERMINAL_VERSION=3.3.1
RUN <<EOF
set -e
dotnet tool install --global Firely.Terminal --version ${FIRELY_TERMINAL_VERSION}
fhir --version
EOF

# renovate: datasource=github-releases depName=HL7/fhir-ig-publisher packageName=HL7/fhir-ig-publisher
ENV PUBLISHER_VERSION=1.7.1
ARG PUBLISHER_VERSION=1.7.1
ARG PUBLISHER_DOWNLOAD_URL="https://github.com/HL7/fhir-ig-publisher/releases/download/${PUBLISHER_VERSION}/publisher.jar"
RUN <<EOF
curl -LSs "$PUBLISHER_DOWNLOAD_URL" --output /usr/local/bin/publisher.jar
chmod +x /usr/local/bin/publisher.jar
EOF

# renovate: datasource=github-releases depName=hapifhir/org.hl7.fhir.core packageName=hapifhir/org.hl7.fhir.core
ENV VALIDATOR_JAR_VERSION=6.4.0
ARG VALIDATOR_JAR_VERSION=6.4.0
ARG VALIDATOR_JAR_DOWNLOAD_URL="https://github.com/hapifhir/org.hl7.fhir.core/releases/download/${VALIDATOR_JAR_VERSION}/validator_cli.jar"
RUN <<EOF
curl -LSs "$VALIDATOR_JAR_DOWNLOAD_URL" --output /usr/local/bin/validator_cli.jar
Expand Down

0 comments on commit 4436296

Please sign in to comment.