diff --git a/Dockerfile.fhir_resource_validator b/Dockerfile.fhir_resource_validator deleted file mode 100644 index 79e46398..00000000 --- a/Dockerfile.fhir_resource_validator +++ /dev/null @@ -1,40 +0,0 @@ -# This line tells Docker to base an image on a pre-built image with Alpine Linux. You can use other images from OpenJDK -# registry. Alpine Linux benefit is that the image is pretty small. We also select JRE-only image since we don't need -# to compile code on the image, only run precompiled classes. -# FROM adoptopenjdk/openjdk11:alpine-jre - -# If for some reason you wish to use the full JDK, the following line can be used -# FROM adoptopenjdk/openjdk11:alpine - -# alpine not supported on arm -FROM eclipse-temurin:11-jre-jammy - -RUN wget https://gitlab.mitre.org/mitre-scripts/mitre-pki/-/raw/master/os_scripts/install_certs.sh -O - | MODE=ubuntu sh \ - && \ - wget https://gitlab.mitre.org/mitre-scripts/mitre-pki/-/raw/master/tool_scripts/install_certs.sh -O - | MODE=java sh - - - -ARG PROJECT_VERSION -RUN echo "Project version set to -> ${PROJECT_VERSION}" - -ENV APPLICATION_USER ktor -RUN adduser $APPLICATION_USER - -RUN mkdir /app -RUN chown -R $APPLICATION_USER /app - -#USER $APPLICATION_USER - -# These lines copy the packaged application into the Docker image and sets the working directory to where it was copied. -# COPY ./build/libs/validator-wrapper-jvm-${PROJECT_VERSION}.jar /app/validator-wrapper.jar -WORKDIR /app -RUN wget -O validator-wrapper.jar https://github.com/dehall/org.hl7.fhir.validator-wrapper/releases/download/docker-test/validator-wrapper.jar - -# Environment vars here -ENV ENVIRONMENT prod - -EXPOSE 3500 - -# The last line instructs Docker to run java with G10s GC, assigns 79% of the system's available memory, and indicates the packaged application. -CMD ["java", "-server", "-XX:+UnlockExperimentalVMOptions", "-XX:InitialRAMPercentage=79", "-XX:MinRAMPercentage=79", "-XX:MaxRAMPercentage=79", "-XX:+UseG1GC", "-XX:MaxGCPauseMillis=100", "-XX:+UseStringDeduplication", "-XX:+CrashOnOutOfMemoryError", "-jar", "validator-wrapper.jar", "-startServer"] diff --git a/docker-compose.background.yml b/docker-compose.background.yml index 6efd9a23..33be1a9f 100644 --- a/docker-compose.background.yml +++ b/docker-compose.background.yml @@ -29,12 +29,7 @@ services: - ./data/redis:/data command: redis-server --appendonly yes # hl7_validator_service: - # image: markiantorno/validator-wrapper - # # If running on the MITRE network, comment out the "image" line above - # # and uncomment the "build" section below - # # build: - # # context: . - # # dockerfile: Dockerfile.fhir_resource_validator + # image: infernocommunity/inferno-resource-validator # volumes: # - ./lib/onc_certification_g10_test_kit/igs:/home/igs # # To let the service share your local FHIR package cache, diff --git a/lib/onc_certification_g10_test_kit.rb b/lib/onc_certification_g10_test_kit.rb index 0ba5ac12..a4d7266d 100644 --- a/lib/onc_certification_g10_test_kit.rb +++ b/lib/onc_certification_g10_test_kit.rb @@ -69,7 +69,8 @@ class G10CertificationSuite < Inferno::TestSuite /\A\S+: \S+: The Coding provided \(\S*\) is not in the value set/, /\A\S+: \S+: The Coding provided \(\S*\) was not found in the value set/, /\A\S+: \S+: A definition for CodeSystem '.*' could not be found, so the code cannot be validated/, - /\A\S+: \S+: URL value '.*' does not resolve/ + /\A\S+: \S+: URL value '.*' does not resolve/, + /\A\S+: \S+: .*\[No server available\]/ # Catch-all for certain errors when TX server is disabled ].freeze def self.setup_validator(us_core_version_requirement) # rubocop:disable Metrics/CyclomaticComplexity diff --git a/lib/onc_certification_g10_test_kit/configuration_checker.rb b/lib/onc_certification_g10_test_kit/configuration_checker.rb index b1b4d0a0..ea6ef140 100644 --- a/lib/onc_certification_g10_test_kit/configuration_checker.rb +++ b/lib/onc_certification_g10_test_kit/configuration_checker.rb @@ -3,7 +3,7 @@ module ONCCertificationG10TestKit class ConfigurationChecker EXPECTED_VALIDATOR_VERSION = '2.3.2'.freeze - EXPECTED_HL7_VALIDATOR_VERSION = '"6.2.16-SNAPSHOT"'.freeze + EXPECTED_HL7_VALIDATOR_VERSION = '"6.3.0"'.freeze def configuration_messages validator_version_message + terminology_messages + version_message