diff --git a/WORKSPACE b/WORKSPACE index 96648b6a..2949bcf3 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -11,6 +11,7 @@ http_archive( # Nix packages load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_git_repository", "nixpkgs_package") + nixpkgs_git_repository( name = "nixpkgs", revision = "2f1f9a9fe8a3c22f0677733523eaf6bd33995d50", @@ -19,7 +20,7 @@ nixpkgs_git_repository( nixpkgs_package( name = "nixops", attribute_path = "nixops", - repositories = { "nixpkgs": "@nixpkgs" }, + repositories = {"nixpkgs": "@nixpkgs"}, ) # Python rules @@ -51,10 +52,12 @@ git_repository( remote = "https://github.com/q3k/rules_docker", commit = "4642a2a7775e5713596bd6e37758735a0f38aa6e", ) + load( "@io_bazel_rules_docker//repositories:repositories.bzl", container_repositories = "repositories", ) + container_repositories() # Docker base images @@ -79,13 +82,14 @@ container_pull( # HTTP stuff from the Internet load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file") + http_file( name = "factorio-headless-0.16.51", urls = ["https://factorio.com/get-download/0.16.51/headless/linux64"], sha256 = "6cb09f5ac87f16f8d5b43cef26c0ae26cc46a57a0382e253dfda032dc5bb367f", downloaded_file_path = "factorio.tar.xz", ) -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file") + http_file( name = "factorio-headless-0.17.41", urls = ["https://factorio.com/get-download/0.17.41/headless/linux64"], @@ -93,6 +97,14 @@ http_file( downloaded_file_path = "factorio.tar.xz", ) +http_file( + name = "factorio-headless-0.17.52", + urls = ["https://factorio.com/get-download/0.17.52/headless/linux64"], + sha256 = "24458a4e16875b0b63677b7e7a068ce2e5b298c110381d17c6f596fd1406db0e", + downloaded_file_path = "factorio.tar.xz", +) + + # Go rules http_archive( @@ -148,7 +160,6 @@ maven_jar( sha1 = "4216af16d38465bbab0f3dff8efa14204f7a399a", ) - # Go repositories go_repository( diff --git a/app/factorio/BUILD b/app/factorio/BUILD index f3fd1914..f0c47f7f 100644 --- a/app/factorio/BUILD +++ b/app/factorio/BUILD @@ -18,6 +18,15 @@ container_image( entrypoint = ["/entrypoint.sh"], ) +container_image( + name="0.17.52-1", + base="@prodimage-bionic//image", + tars = ["@factorio-headless-0.17.52//file"], + files = [":entrypoint.sh"], + directory = "/", + entrypoint = ["/entrypoint.sh"], +) + # Totally broken right now because google/containerregistry doesn't handle # /usr/bin/env python == python3. #container_push( @@ -31,11 +40,11 @@ container_image( # So this is a replacement hack. genrule( name = "push_latest", - srcs = [":0.17.41-1"], + srcs = [":0.17.52-1"], outs = ["version.sh"], executable = True, cmd = """ - tag=0.17.41-1 + tag=0.17.52-1 docker tag bazel/app/factorio:$$tag registry.k0.hswaw.net/app/factorio:$$tag docker push registry.k0.hswaw.net/app/factorio:$$tag echo -ne "#!/bin/sh\necho Pushed $$tag.\n" > $(OUTS) diff --git a/app/factorio/kube/prod.jsonnet b/app/factorio/kube/prod.jsonnet index 96040331..b58bea97 100644 --- a/app/factorio/kube/prod.jsonnet +++ b/app/factorio/kube/prod.jsonnet @@ -5,6 +5,7 @@ local kube = import "../../../kube/kube.libsonnet"; // Available versions: // - 0.16.51-1 // - 0.17.41-1 +// - 0.17.52-1 { local prod = self, @@ -18,5 +19,5 @@ local kube = import "../../../kube/kube.libsonnet"; } }, - q3k: prod.instance("q3k", "0.17.41-1"), + q3k: prod.instance("q3k", "0.17.52-1"), }