From 7a186bafa579b57d838db2bfcb31098aac115a02 Mon Sep 17 00:00:00 2001 From: Ivan Subotic <400790+subotic@users.noreply.github.com> Date: Fri, 25 Feb 2022 09:30:49 +0100 Subject: [PATCH] build: fix docker image name (DEV-574) (#2007) --- WORKSPACE | 113 ------------------- build.sbt | 2 +- docker-compose.yml | 2 +- third_party/dependencies.bzl | 204 ----------------------------------- 4 files changed, 2 insertions(+), 319 deletions(-) delete mode 100644 third_party/dependencies.bzl diff --git a/WORKSPACE b/WORKSPACE index 7d0066630a..6d189d45ff 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -125,119 +125,6 @@ container_pull( repository = FUSEKI_REPOSITORY, ) -##################################### -# Scala # -##################################### - -rules_scala_version = "0ac75d3a044b8e316d1b11b90a7d044685bd72e8" # 22.04.2021 - -rules_scala_version_sha256 = "7624c95c19b60df943dbde90c54d09ecad9aca9432b1211da8352f131776ac36" - -http_archive( - name = "io_bazel_rules_scala", - sha256 = rules_scala_version_sha256, - strip_prefix = "rules_scala-%s" % rules_scala_version, - type = "zip", - url = "https://github.com/bazelbuild/rules_scala/archive/%s.zip" % rules_scala_version, -) - -# Stores Scala version and other configuration -# 2.12 is a default version, other versions can be use by passing them explicitly: -# scala_config(scala_version = "2.11.12") -load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") - -scala_config(scala_version = "2.13.7") - -# register default and our custom scala toolchain -load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains") - -scala_register_toolchains() - -register_toolchains("//toolchains:dsp_api_scala_toolchain") - -# needed by rules_scala -load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories") - -scala_repositories() - -# register the test toolchain for rules_scala -load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain") - -scalatest_repositories() - -scalatest_toolchain() - -##################################### -# Protobuf (Scala Annex) # -##################################### - -protobuf_tag = "3.12.3" - -protobuf_sha256 = "e5265d552e12c1f39c72842fa91d84941726026fa056d914ea6a25cd58d7bbf8" - -http_archive( - name = "com_google_protobuf", - sha256 = protobuf_sha256, - strip_prefix = "protobuf-{}".format(protobuf_tag), - type = "zip", - url = "https://github.com/protocolbuffers/protobuf/archive/v{}.zip".format(protobuf_tag), -) - -load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") - -protobuf_deps() - -##################################### -# JAR Dependencies # -##################################### -# -# defined in the third_party sub-folder -# -rules_jvm_external_version = "4.0" # 6.01.2021 - -rules_jvm_external_version_sha256 = "31701ad93dbfe544d597dbe62c9a1fdd76d81d8a9150c2bf1ecf928ecdf97169" - -http_archive( - name = "rules_jvm_external", - sha256 = rules_jvm_external_version_sha256, - strip_prefix = "rules_jvm_external-%s" % rules_jvm_external_version, - url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % rules_jvm_external_version, -) - -# load the dependencies defined in the third_party sub-folder -load("//third_party:dependencies.bzl", "dependencies") - -dependencies() - -# pin dependencies to the ones stored in maven_install.json in the third_party sub-folder -# to update: bazel run @maven//:pin -load("@maven//:defs.bzl", "pinned_maven_install") - -pinned_maven_install() - -##################################### -# Twirl templates # -##################################### -rules_twirl_version = "9ac789845e3a481fe520af57bd47a4261edb684f" # 29.04.2020 - -rules_twirl_version_sha256 = "b1698a2a59b76dc9df233314c2a1ca8cee4a0477665cff5eafd36f92057b2044" - -http_archive( - name = "io_bazel_rules_twirl", - sha256 = rules_twirl_version_sha256, - strip_prefix = "rules_twirl-%s" % rules_twirl_version, - type = "zip", - url = "https://github.com/lucidsoftware/rules_twirl/archive/%s.zip" % rules_twirl_version, -) - -load("@io_bazel_rules_twirl//:workspace.bzl", "twirl_repositories") - -twirl_repositories() - -load("@twirl//:defs.bzl", twirl_pinned_maven_install = "pinned_maven_install") - -twirl_pinned_maven_install() - ##################################### # rules_pkg - basic packaging rules # ##################################### diff --git a/build.sbt b/build.sbt index cbaf1f6150..0c61d27aaf 100644 --- a/build.sbt +++ b/build.sbt @@ -148,7 +148,7 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi")) Compile / mainClass := Some("org.knora.webapi.app.Main"), // add dockerCommands used to create the image // docker:stage, docker:publishLocal, docker:publish, docker:clean - Docker / dockerRepository := Some("dasch-swiss"), + Docker / dockerRepository := Some("daschswiss"), Docker / packageName := "knora-api", dockerUpdateLatest := true, dockerBaseImage := "eclipse-temurin:11-jre-focal", diff --git a/docker-compose.yml b/docker-compose.yml index 488c6f4bb7..2c52004a11 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ services: command: --config=/sipi/config/sipi.knora-docker-config.lua api: - image: dasch-swiss/knora-api:latest + image: daschswiss/knora-api:latest ports: - "3333:3333" volumes: diff --git a/third_party/dependencies.bzl b/third_party/dependencies.bzl deleted file mode 100644 index c599f89859..0000000000 --- a/third_party/dependencies.bzl +++ /dev/null @@ -1,204 +0,0 @@ -""" Maven dependencies loaded into the workspace """ - -# docs for rules_jvm_external: https://github.com/bazelbuild/rules_jvm_external -load("@rules_jvm_external//:defs.bzl", "maven_install") -load("@rules_jvm_external//:specs.bzl", "maven") -load("//third_party:versions.bzl", "AKKA_HTTP_VERSION", "AKKA_VERSION", "JENA_VERSION") - -def dependencies(): - # - # e.g., to reference use: @maven//com_typesafe_akka_akka_actor_2_13 - # - # ATTENTION: Transitive dependencies need to be explicitly added - # to query: bazel query @maven//:all --output=build > dependencies.bzl - # or: bazel query @maven//:all | sort - # - maven_install( - artifacts = [ - # akka - "com.typesafe.akka:akka-actor_2.13:%s" % (AKKA_VERSION), - "com.typesafe.akka:akka-stream_2.13:%s" % (AKKA_VERSION), - "com.typesafe.akka:akka-slf4j_2.13:%s" % (AKKA_VERSION), - - # akka http - "com.typesafe.akka:akka-http_2.13:%s" % (AKKA_HTTP_VERSION), - "com.typesafe.akka:akka-http-xml_2.13:%s" % (AKKA_HTTP_VERSION), - "com.typesafe.akka:akka-http-spray-json_2.13:%s" % (AKKA_HTTP_VERSION), - "com.typesafe.akka:akka-http-jackson_2.13:%s" % (AKKA_HTTP_VERSION), - "com.typesafe:config:1.3.3", - - # ZIO - "dev.zio:zio_2.13:2.0.0-M3", - "dev.zio:zio-json_2.13:0.1.5", - "dev.zio:zio-test_2.13:2.0.0-M3", - "dev.zio:zio-test-junit_2.13:2.0.0-M3", - "dev.zio:zio-prelude_2.13:1.0.0-RC6", - - # CORS support - "ch.megard:akka-http-cors_2.13:1.0.0", - - # Jena - "org.apache.jena:apache-jena-libs:%s" % (JENA_VERSION), - "org.apache.jena:jena-text:%s" % (JENA_VERSION), - - # Logging - "com.typesafe.scala-logging:scala-logging_2.13:3.9.4", - "ch.qos.logback:logback-classic:1.2.9", - "ch.qos.logback:logback-core:1.2.9", - "org.slf4j:log4j-over-slf4j:1.7.32", - "org.slf4j:jcl-over-slf4j:1.7.32", - "org.slf4j:slf4j-api:1.7.32", - - # metrics - "io.kamon:kamon-core_2.13:2.1.5", - "io.kamon:kamon-scala-future_2.13:2.1.5", - "io.kamon:kamon-akka-http_2.13:2.1.5", - "io.kamon:kamon-prometheus_2.13:2.1.5", - "io.kamon:kamon-logback_2.13:2.1.5", - "org.aspectj:aspectjweaver:1.9.4", - - # input validation - "commons-validator:commons-validator:1.6", - - # authentication - "org.bouncycastle:bcprov-jdk15on:1.64", - "org.springframework.security:spring-security-core:5.1.5.RELEASE", - "com.pauldijou:jwt-spray-json_2.13:5.0.0", - - # caching - "net.sf.ehcache:ehcache:2.10.3", - "redis.clients:jedis:3.1.0-m4", - - # serialization (used in caching) - "com.twitter:chill_2.13:0.9.5", - - # other - # "javax.transaction" % "transaction-api" % "1.1-rev-1", - "org.apache.commons:commons-text:1.6", - "commons-io:commons-io:2.6", - "commons-beanutils:commons-beanutils:1.9.3", # not used by us, but need newest version to prevent this problem: http://stackoverflow.com/questions/14402745/duplicate-classes-in-commons-collections-and-commons-beanutils - "org.jodd:jodd:3.2.6", - "joda-time:joda-time:2.9.1", - "org.joda:joda-convert:1.8", - "com.sksamuel.diff:diff:1.1.11", - "org.xmlunit:xmlunit-core:2.1.1", - - # other - "org.eclipse.rdf4j:rdf4j-runtime:3.4.4", - "org.eclipse.rdf4j:rdf4j-client:3.4.4", - "org.eclipse.rdf4j:rdf4j-shacl:3.4.4", - "org.rogach:scallop_2.13:3.5.1", - "com.google.gwt:gwt-servlet:2.8.0", - "net.sf.saxon:Saxon-HE:9.9.0-2", - # "org.scala-lang.modules:scala-xml_2.13:1.1.1", - "org.scala-lang.modules:scala-java8-compat_2.13:0.9.1", - - # provides akka jackson (json) support - "de.heikoseeberger:akka-http-circe_2.13:1.36.0", - "com.fasterxml.jackson.module:jackson-module-scala_2.13:2.12.3", - "com.apicatalog:titanium-json-ld:1.2.0", - "org.glassfish:jakarta.json:2.0.1", - - # swagger (api documentation) - "com.github.swagger-akka-http:swagger-akka-http_2.13:1.2.0", - - # Java EE modules which are deprecated in Java SE 9, 10 and will be removed in Java SE 11 - "javax.xml.bind:jaxb-api:2.2.12", - "com.ibm.icu:icu4j:62.1", - "org.apache.httpcomponents:httpclient:4.5.6", - - # Twirl templates - "com.typesafe.play:twirl-api_2.13:1.5.1", - - # scala stuff - "org.scala-lang.modules:scala-xml_2.13:1.2.0", - - # testing - "com.typesafe.akka:akka-testkit_2.13:%s" % (AKKA_VERSION), - "com.typesafe.akka:akka-stream-testkit_2.13:%s" % (AKKA_VERSION), - "com.typesafe.akka:akka-http-testkit_2.13:%s" % (AKKA_HTTP_VERSION), - "org.scalatest:scalatest_2.13:3.2.2", - "org.scalatest:scalatest-core_2.13:3.2.2", - "org.scalatest:scalatest-wordspec_2.13:3.2.2", - "org.scalatest:scalatest-matchers-core_2.13:3.2.2", - "org.scalatest:scalatest-shouldmatchers_2.13:3.2.2", - "org.scalatest:scalatest-compatible:3.2.2", - "org.testcontainers:testcontainers:1.16.0", - "junit:junit:4.13.2", - "io.gatling.highcharts:gatling-charts-highcharts:3.2.1", - "io.gatling:gatling-test-framework:3.2.1", - - # Additional Selenium libraries besides the ones pulled in during init - # of io_bazel_rules_webtesting - "org.seleniumhq.selenium:selenium-support:3.141.59", - - # Graph for Scala - "org.scala-graph:graph-core_2.13:1.13.1", - ], - repositories = [ - "https://repo.maven.apache.org/maven2", - "https://maven-central.storage-download.googleapis.com/maven2", - "https://mirror.bazel.build/repo1.maven.org/maven2", - "https://jcenter.bintray.com", - "https://dl.bintray.com/typesafe/maven-releases/", - "https://maven.google.com", - "https://repo1.maven.org/maven2", - "https://central.maven.org/maven2", - ], - ) - -ALL_WEBAPI_MAIN_DEPENDENCIES = [ - "//webapi/src/main/scala/org/knora/webapi", - "//webapi/src/main/scala/org/knora/webapi/app", - "//webapi/src/main/scala/org/knora/webapi/core", - "//webapi/src/main/scala/org/knora/webapi/exceptions", - "//webapi/src/main/scala/org/knora/webapi/feature", - "//webapi/src/main/scala/org/knora/webapi/http/directives", - "//webapi/src/main/scala/org/knora/webapi/http/handler", - "//webapi/src/main/scala/org/knora/webapi/http/version", - "//webapi/src/main/scala/org/knora/webapi/http/version/versioninfo", - "//webapi/src/main/scala/org/knora/webapi/instrumentation", - "//webapi/src/main/scala/org/knora/webapi/messages", - "//webapi/src/main/scala/org/knora/webapi/responders", - "//webapi/src/main/scala/org/knora/webapi/routing", - "//webapi/src/main/scala/org/knora/webapi/settings", - "//webapi/src/main/scala/org/knora/webapi/store", - "//webapi/src/main/scala/org/knora/webapi/store/cacheservice", - "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/redis", - "//webapi/src/main/scala/org/knora/webapi/util", - "//webapi/src/main/scala/org/knora/webapi/util/cache", -] - -BASE_TEST_DEPENDENCIES = [ - "@maven//:com_typesafe_scala_logging_scala_logging_2_13", - "@maven//:org_slf4j_slf4j_api", - "@maven//:com_typesafe_akka_akka_actor_2_13", - "@maven//:com_typesafe_akka_akka_testkit_2_13", - "@maven//:com_typesafe_akka_akka_http_2_13", - "@maven//:com_typesafe_akka_akka_http_core_2_13", - "@maven//:com_typesafe_akka_akka_http_testkit_2_13", - "@maven//:com_typesafe_akka_akka_stream_2_13", - "@maven//:com_typesafe_config", - "@maven//:dev_zio_zio_2_13", - "@maven//:dev_zio_zio_prelude_2_13", - "@maven//:org_scalatest_scalatest_2_13", - "@maven//:org_scalatest_scalatest_core_2_13", - "@maven//:org_scalatest_scalatest_wordspec_2_13", - "@maven//:org_scalatest_scalatest_matchers_core_2_13", - "@maven//:org_scalatest_scalatest_shouldmatchers_2_13", - "@maven//:org_scalatest_scalatest_compatible", - "@maven//:org_scalactic_scalactic_2_13", - "@maven//:org_scala_graph_graph_core_2_13", -] - -BASE_TEST_DEPENDENCIES_WITH_JSON = BASE_TEST_DEPENDENCIES + [ - "@maven//:com_typesafe_akka_akka_http_spray_json_2_13", - "@maven//:com_typesafe_akka_akka_http_xml_2_13", - "@maven//:io_spray_spray_json_2_13", -] - -BASE_TEST_DEPENDENCIES_WITH_JSON_LD = BASE_TEST_DEPENDENCIES + [ - "@maven//:io_spray_spray_json_2_13", - "@maven//:com_apicatalog_titanium_json_ld", - "@maven//:org_glassfish_jakarta_json", -]