Skip to content

Commit

Permalink
Update CQLT, Java, Platform, Events (#33)
Browse files Browse the repository at this point in the history
* Update CQLT, Java, Platform, Events

* Upate CQL Translator to 1.5.12
* Update Java to Temurin 11
* Update Docker image to support AMD and ARM platforms
* Update Docker Publish action to trigger on PRs

* Fix syntax of conditional expression in GitHub Action file
  • Loading branch information
cmoesel authored Nov 21, 2022
1 parent 0530d8f commit 7251cf0
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 12 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/docker-publish-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
name: Publish Docker image

on:
pull_request:
release:
types: [published]

Expand Down Expand Up @@ -39,9 +40,11 @@ jobs:
uses: docker/build-push-action@v3
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
-
if: github.event_name == 'release'
name: Update repo description
uses: peter-evans/dockerhub-description@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# fetch basic image
FROM maven:3.6.1-jdk-8
FROM maven:3.8.6-eclipse-temurin-11

# application placed into /opt/app
RUN mkdir -p /app
Expand All @@ -19,4 +19,4 @@ EXPOSE 8080

# execute it
# CMD ["mvn", "exec:java"]
CMD ["java", "-jar", "target/cqlTranslationServer-1.5.10-jar-with-dependencies.jar", "-d"]
CMD ["java", "-jar", "target/cqlTranslationServer-1.5.12-jar-with-dependencies.jar", "-d"]
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Build:

Execute via the command line:

java -jar target/cqlTranslationServer-1.5.10-jar-with-dependencies.jar
java -jar target/cqlTranslationServer-1.5.12-jar-with-dependencies.jar

## Translator Endpoint

Expand Down Expand Up @@ -277,10 +277,16 @@ You may deploy pre-built Docker images into your existing hosting environment wi

And you're done. No environment variables or further configuration are needed. Jedis may use your existing Kubernetes, Open Shift etc installations as you see fit. :)

To build your own image:
To build your own image for your current architecture:

docker build -t cqframework/cql-translation-service:latest . # but use your your own repo and tag strings!

To build your own image for multiple architectures (e.g., Intel and Mac M1):

docker buildx build --platform linux/amd64,linux/arm64 -t cqframework/cql-translation-service:latest . # but use your your own repo and tag strings!

Note that Docker doesn't support loading multi-platform builds locally, so the above multi-platform build commmand is only helpful when used with `--push`. See: [https://github.com/docker/buildx/issues/59](https://github.com/docker/buildx/issues/59).

## Environment Variables

**CQL_TRANSLATOR_PORT** - Allows you to set the port on which the translation service runs, default value is 8080
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.mitre.bonnie</groupId>
<artifactId>cqlTranslationServer</artifactId>
<packaging>jar</packaging>
<version>1.5.10</version>
<version>1.5.12</version>
<name>cqlTranslationServer</name>

<repositories>
Expand Down Expand Up @@ -70,37 +70,37 @@
<dependency>
<groupId>info.cqframework</groupId>
<artifactId>cql</artifactId>
<version>1.5.10</version>
<version>1.5.12</version>
</dependency>
<dependency>
<groupId>info.cqframework</groupId>
<artifactId>model</artifactId>
<version>1.5.10</version>
<version>1.5.12</version>
</dependency>
<dependency>
<groupId>info.cqframework</groupId>
<artifactId>cql-to-elm</artifactId>
<version>1.5.10</version>
<version>1.5.12</version>
</dependency>
<dependency>
<groupId>info.cqframework</groupId>
<artifactId>elm</artifactId>
<version>1.5.10</version>
<version>1.5.12</version>
</dependency>
<dependency>
<groupId>info.cqframework</groupId>
<artifactId>quick</artifactId>
<version>1.5.10</version>
<version>1.5.12</version>
</dependency>
<dependency>
<groupId>info.cqframework</groupId>
<artifactId>qdm</artifactId>
<version>1.5.10</version>
<version>1.5.12</version>
</dependency>
<dependency>
<groupId>info.cqframework</groupId>
<artifactId>cql-formatter</artifactId>
<version>1.5.10</version>
<version>1.5.12</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand Down

0 comments on commit 7251cf0

Please sign in to comment.