Skip to content

Commit

Permalink
Merge pull request #58 from bitjourney/20220823_upgrade_packages
Browse files Browse the repository at this point in the history
20220823 upgrade packages
  • Loading branch information
kuroponzu authored Aug 23, 2022
2 parents ffff34c + 6fafa24 commit 9ce8a23
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 7 deletions.
28 changes: 28 additions & 0 deletions DockerfileForDebug
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This is a dockerfile for local debbug
# usage
# 1. Execute './gradlew stage'
# 2. Execute 'docker build -f DockerfileForDebug . -t plantuml_test'

# https://hub.docker.com/_/eclipse-temurin?tab=description&page=2&name=17
FROM eclipse-temurin:17

ARG PLANTUML_SERVICE_BIN_DIR="/home/app/plantuml-service/bin"
ARG PLANTUML_SERVICE_PATH="${PLANTUML_SERVICE_BIN_DIR}/plantuml-service.jar"

USER root

RUN useradd --create-home app \
&& apt-get update -qq \
&& apt-get upgrade -y \
&& apt-get install -y graphviz fonts-takao curl \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p ${PLANTUML_SERVICE_BIN_DIR} \
&& chown -R app ${PLANTUML_SERVICE_BIN_DIR}

COPY build/libs/plantuml-service.jar ${PLANTUML_SERVICE_BIN_DIR}

USER app

ENTRYPOINT ["/opt/java/openjdk/bin/java"]
CMD ["-jar", "/home/app/plantuml-service/bin/plantuml-service.jar"]
16 changes: 9 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ version '1.4.0'

final MainClassName = "${group}.Main"

// See http://plantuml.com/changes
final PlantUmlVersion = "1.2022.5"
// See
// http://plantuml.com/changes
// https://search.maven.org/artifact/net.sourceforge.plantuml/plantuml
final PlantUmlVersion = "1.2022.6"

final ArchiveName = "plantuml-service.jar"

buildscript {
// https://kotlinlang.org/
ext.kotlin_version = '1.6.20'
ext.kotlin_version = '1.7.10'
repositories {
mavenCentral()
}
Expand All @@ -31,11 +33,11 @@ compileTestKotlin {
dependencies {
implementation "net.sourceforge.plantuml:plantuml:$PlantUmlVersion"
implementation "com.sparkjava:spark-core:2.9.3"
implementation "com.github.ben-manes.caffeine:caffeine:2.9.3"
implementation "org.slf4j:slf4j-simple:1.7.21"
implementation "com.google.code.gson:gson:2.9.0"
implementation "org.slf4j:slf4j-simple:2.0.0"
implementation "com.google.code.gson:gson:2.9.1"
implementation "com.github.ben-manes.caffeine:caffeine:3.1.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.6.2'
}
repositories {
Expand Down

0 comments on commit 9ce8a23

Please sign in to comment.