From 2b4b70a6ca3aa5f10e0dc079b5304a4e56f7c13c Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Thu, 15 Aug 2024 01:02:57 +0200 Subject: [PATCH 1/4] changing paths --- .github/workflows/README.md | 2 +- docs/src/apalache/installation/docker.md | 22 +++++++++++----------- script/run-docker.sh | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/README.md b/.github/workflows/README.md index d8d29ba024..49339e90ce 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -9,7 +9,7 @@ - Triggered by pull requests into `main`. - Used for any artifacts that we deploy into production environments. Currently, - this only consists of our website at https://apalache.informal.systems. + this only consists of our website at https://apalache-mc.org. ## [./prepare-release.yml](./prepare-release.yml) diff --git a/docs/src/apalache/installation/docker.md b/docs/src/apalache/installation/docker.md index d5eea19e76..c43bfbea58 100644 --- a/docs/src/apalache/installation/docker.md +++ b/docs/src/apalache/installation/docker.md @@ -14,7 +14,7 @@ suitable JVM, and the container supplies this. However, you must already have To get the latest Apalache image, issue the command: ```bash -docker pull ghcr.io/informalsystems/apalache +docker pull ghcr.io/apalache-mc/apalache ``` ## Running the docker image @@ -22,7 +22,7 @@ docker pull ghcr.io/informalsystems/apalache To run an Apalache image, issue the command: ```bash -$ docker run --rm -v :/var/apalache ghcr.io/informalsystems/apalache +$ docker run --rm -v :/var/apalache ghcr.io/apalache-mc/apalache ``` The following docker parameters are used: @@ -38,8 +38,8 @@ The following docker parameters are used: When using SELinux, you might have to use the modified form of `-v` option: `-v :/var/apalache:z` -- `informalsystems/apalache` is the APALACHE docker image name. By default, the `latest` stable - version is used; you can also refer to a specific tool version, e.g., `informalsystems/apalache:0.6.0` or `informalsystems/apalache:main` +- `apalache-mc/apalache` is the APALACHE docker image name. By default, the `latest` stable + version is used; you can also refer to a specific tool version, e.g., `apalache-mc/apalache:0.6.0` or `apalache-mc/apalache:main` - `` are the tool arguments as described in [Running the Tool](../running.md). We provide a convenience wrapper for this docker command in @@ -67,11 +67,11 @@ Apalache in docker while sharing the working directory: ###### using the latest stable -$ alias apalache='docker run --rm -v $(pwd):/var/apalache ghcr.io/informalsystems/apalache' +$ alias apalache='docker run --rm -v $(pwd):/var/apalache ghcr.io/apalache-mc/apalache' ###### using the latest main -$ alias apalache='docker run --rm -v $(pwd):/var/apalache ghcr.io/informalsystems/apalache:main' +$ alias apalache='docker run --rm -v $(pwd):/var/apalache ghcr.io/apalache-mc/apalache:main' ``` ## Using the development branch of Apalache @@ -82,25 +82,25 @@ branch for a report of the newest features. Since we cut releases weekly, you should have access to all the latest features in the last week by using the `latest` tag. However, if you wish to use the very latest developments as they are added throughout the week, you can run the image with the `main` tag: just -type `ghcr.io/informalsystems/apalache:main` instead of -`ghcr.io/informalsystems/apalache` everywhere. +type `ghcr.io/apalache-mc/apalache:main` instead of +`ghcr.io/apalache-mc/apalache` everywhere. Do not forget to pull the docker image from time to time: ```bash -docker pull ghcr.io/informalsystems/apalache:main +docker pull ghcr.io/apalache-mc/apalache:main ``` Run it with the following command: ```bash -$ docker run --rm -v :/var/apalache ghcr.io/informalsystems/apalache:main +$ docker run --rm -v :/var/apalache ghcr.io/apalache-mc/apalache:main ``` To create an alias pointing to the `main` version: ```bash -$ alias apalache='docker run --rm -v $(pwd):/var/apalache ghcr.io/informalsystems/apalache:main' +$ alias apalache='docker run --rm -v $(pwd):/var/apalache ghcr.io/apalache-mc/apalache:main' ``` [changelog]: https://github.com/informalsystems/apalache/blob/main/CHANGES.md diff --git a/script/run-docker.sh b/script/run-docker.sh index 05d3df4c8b..4f8a094ffc 100755 --- a/script/run-docker.sh +++ b/script/run-docker.sh @@ -14,9 +14,9 @@ if [ -z "$APALACHE_TAG" ] then >&2 echo "# No docker image supplied. Defaulting to '$default_tag'" >&2 echo "# To run a specific docker tag set APALACHE_TAG." - img="ghcr.io/informalsystems/apalache:${default_tag}" + img="ghcr.io/apalache-mc/apalache:${default_tag}" else - img="ghcr.io/informalsystems/apalache:${APALACHE_TAG}" + img="ghcr.io/apalache-mc/apalache:${APALACHE_TAG}" fi # TODO Programmatically generate envars to expose here From 4ef62e9116d6923686aaff80c084016bd596ec19 Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Thu, 15 Aug 2024 10:37:28 +0200 Subject: [PATCH 2/4] update the build data --- build.sbt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 83145fae79..5d668fedf7 100644 --- a/build.sbt +++ b/build.sbt @@ -8,11 +8,11 @@ import scala.sys.process._ /////////////////////////// name := "apalache" -maintainer := "apalache@informal.org" +maintainer := "apalache@konnov.phd" // See https://www.scala-sbt.org/1.x/docs/Multi-Project.html#Build-wide+settings -ThisBuild / organizationName := "Informal Systems Inc." -ThisBuild / organizationHomepage := Some(url("https://informal.systems")) +ThisBuild / organizationName := "Apalache Development Team" +ThisBuild / organizationHomepage := Some(url("https://apalache-mc.org")) ThisBuild / licenses += "Apache 2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0") // We store the version in a bare file to make accessing and updating the version trivial @@ -351,7 +351,7 @@ lazy val root = (project in file(".")) log.info(s"Unpacking package ${pkg} to ${target_dir}") // send outputs directly to std{err,out} instead of logging here // to avoid misleading logging output from tar - // See https://github.com/informalsystems/apalache/pull/1382 + // See https://github.com/apalache-mc/apalache/pull/1382 (s"tar zxvf ${pkg} -C ${target_dir}" !) log.info(s"Symlinking ${current_pkg} -> ${unzipped}") if (current_pkg.exists) { @@ -369,7 +369,7 @@ lazy val root = (project in file(".")) docker / imageNames := { val img: String => ImageName = s => ImageName( - namespace = Some("ghcr.io/informalsystems"), + namespace = Some("ghcr.io/apalache-mc"), repository = name.value, tag = Some(s), ) @@ -425,7 +425,7 @@ lazy val versionFile = settingKey[File]("Location of the file tracking the proje // These tasks are used in our bespoke release pipeline // TODO(shon): Once we've changed our packaging to conform to more standard SBT structures and practices, // we should consider moving to a release pipeline based around sbt-release. -// See https://github.com/informalsystems/apalache/issues/1248 +// See https://github.com/apalache-mc/apalache/issues/1248 lazy val printVersion = taskKey[Unit]("Print the current version") printVersion := { From eb78dcdf21266b19ede1c3362373dd3471197457 Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Thu, 15 Aug 2024 10:45:39 +0200 Subject: [PATCH 3/4] switch to the azul docker image --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 5d668fedf7..0202123960 100644 --- a/build.sbt +++ b/build.sbt @@ -391,7 +391,7 @@ docker / dockerfile := { val readme = rootDir / "README.md" new Dockerfile { - from("eclipse-temurin:17") + from("azul/zulu-openjdk:17-latest") workDir(dwd) From b0eb4d868e9153e11c42a45a12324ce537f8e2fd Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Fri, 16 Aug 2024 11:37:36 +0200 Subject: [PATCH 4/4] revert to Temurin --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 0202123960..e3a78b4616 100644 --- a/build.sbt +++ b/build.sbt @@ -391,7 +391,7 @@ docker / dockerfile := { val readme = rootDir / "README.md" new Dockerfile { - from("azul/zulu-openjdk:17-latest") + from("eclipse-temurin:17") workDir(dwd) @@ -406,7 +406,7 @@ docker / dockerfile := { // We need sudo to run apalache using the user (created in the entrypoint script) run("apt", "update") - run("apt", "install", "sudo") + run("apt", "install", "-y", "sudo") entryPoint("/opt/apalache/bin/run-in-docker-container") }