Skip to content
Permalink
Browse files
build: fix docker image name (DEV-574) (#2007)
  • Loading branch information
subotic committed Feb 25, 2022
1 parent e2683ac commit 7a186bafa579b57d838db2bfcb31098aac115a02
Showing with 2 additions and 319 deletions.
  1. +0 −113 WORKSPACE
  2. +1 −1 build.sbt
  3. +1 −1 docker-compose.yml
  4. +0 −204 third_party/dependencies.bzl
113 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 #
#####################################
@@ -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",
@@ -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:

This file was deleted.

0 comments on commit 7a186ba

Please sign in to comment.