Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "ghcr.io/dfinity/ic-dev@sha256:55869a1fe673acc67575c794d4a2746ed7e7d543e3d8dafa83fc05c275a37020",
"image": "ghcr.io/dfinity/ic-dev@sha256:657e582dca33b7dba6fa8bd30f755fcf49b9c034474fbc7fe45dbf9049bb2d1c",
"remoteUser": "ubuntu",
"privileged": true,
"runArgs": [
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/api-bn-recovery-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on:
labels: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host
--mount type=tmpfs,target="/home/buildifier/.local/share/containers"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
runs-on: &dind-large-setup
labels: dind-large
container: &container-setup
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 90
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
runs-on: &dind-small-setup
labels: dind-small
container: &container-setup
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --mount type=tmpfs,target="/tmp/containers"
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-rbe-evaluation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ jobs:
needs: [config, infer-bazel-targets]
runs-on: namespace-profile-rbe-driver-amd64-linux-16x32
container:
image: nscr.io/c9ptjuknd7oc6/ic-build@sha256:e547c5b211096fc5ad67253d035fc258a15126ff671ae006875f3dcc1f88f986
image: nscr.io/c9ptjuknd7oc6/ic-build@sha256:743ba739f6dbd1ea20f35c08420c655f512282b5ca8ade55317591f78c8a3a50
# ic-os image builds run 'podman build' (rootless) and are forced to run locally in
# this container by --strategy_regexp=ic-os[:/].*=local in bazel/conf/.bazelrc.build.
# Rootless podman needs to create user namespaces, which fails in an unprivileged
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
run: |
set -euo pipefail

worker_image="docker://nscr.io/c9ptjuknd7oc6/ic-build@sha256:e547c5b211096fc5ad67253d035fc258a15126ff671ae006875f3dcc1f88f986"
worker_image="docker://nscr.io/c9ptjuknd7oc6/ic-build@sha256:743ba739f6dbd1ea20f35c08420c655f512282b5ca8ade55317591f78c8a3a50"

# Directory for the Build Event Protocol and execution profile files,
# later uploaded to Namespace Artifact Storage for offline analysis.
Expand Down Expand Up @@ -296,7 +296,7 @@ jobs:
run: |
set -euo pipefail

worker_image="docker://nscr.io/c9ptjuknd7oc6/ic-build@sha256:e547c5b211096fc5ad67253d035fc258a15126ff671ae006875f3dcc1f88f986"
worker_image="docker://nscr.io/c9ptjuknd7oc6/ic-build@sha256:743ba739f6dbd1ea20f35c08420c655f512282b5ca8ade55317591f78c8a3a50"

# Directory for the Build Event Protocol and execution profile files,
# later uploaded to Namespace Artifact Storage for offline analysis.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container-api-bn-recovery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on:
labels: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host
--mount type=tmpfs,target="/home/buildifier/.local/share/containers"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container-scan-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on:
labels: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 60
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/local-system-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on:
labels: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 600
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pocket-ic-tests-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
bazel-build-pocket-ic:
name: Bazel Build PocketIC
container:
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 90
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rate-limits-backend-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
labels: dind-large

container:
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info --mount type=tmpfs,target="/tmp/containers"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
group: dm1
labels: dind-large
container: &container-setup
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 180
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rosetta-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on:
labels: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
environment: DockerHub
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/salt-sharing-canister-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
labels: dind-large

container:
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info --mount type=tmpfs,target="/tmp/containers"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-daily-bare-metal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: &dind-large-setup
labels: dind-large
container: &container-setup
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
environment: Bare Metal Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: &dind-large-setup
labels: dind-large
container: &container-setup
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 720 # 12 hours
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-rust-bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# see linux-x86-64 runner group
labels: rust-benchmarks
container:
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
# running on bare metal machine using ubuntu user
options: --user ubuntu --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 720 # 12 hours
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/system-tests-benchmarks-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
group: dm1
labels: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 480
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-mainnet-canister-revisions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
labels: dind-small
environment: CREATE_PR
container:
image: ghcr.io/dfinity/ic-build@sha256:6002fe4444d6761b59522d453734bd337736c0a21fdaff57fac6bc98530e05af
image: ghcr.io/dfinity/ic-build@sha256:631b89b4b353889b5ab845fe0305cfed185091efe16bf6c79029cf083db4e42c
options: >-
-e NODE_NAME --privileged --cgroupns host -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info --mount type=tmpfs,target="/tmp/containers"
env:
Expand Down
10 changes: 0 additions & 10 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -1370,16 +1370,6 @@ register_toolchains(

new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "new_local_repository")

# Use libsystemd from the host environment
# Ideally this is pulled hermetically, but as this is only used by infogetty
# within IC images, we have less compatibility to worry about, and packaging it
# this way is easier.
new_local_repository(
name = "libsystemd",
build_file = "@//third_party:BUILD.libsystemd.bazel",
path = "/usr",
)

# Use libvirt from the host environment
# Used for managing virtual machines programmatically.
new_local_repository(
Expand Down
2 changes: 1 addition & 1 deletion ci/container/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cb0f4166b0ab9a2188473be3375ffcc73d29c43a793f93fea23d9e63e67207de
3666b0fbc314b172ad259fb4928068cc150b6d7b66bd057a756dca6bad54d9f5
1 change: 0 additions & 1 deletion ci/container/files/packages.common
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ ipmitool # to connect to baremetal test instances
# Linked in by IC-OS binaries for managing encrypted disks.
libcryptsetup-dev
libselinux-dev
libsystemd-dev
# Linked in by IC-OS binaries for managing virtual machines programmatically.
libvirt-dev
podman
Expand Down
1 change: 0 additions & 1 deletion cpp/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ cc_binary(
target_compatible_with = [
"@platforms//os:linux",
],
deps = ["@libsystemd"],
)

genrule(
Expand Down
6 changes: 3 additions & 3 deletions cpp/infogetty-cpp/infogetty.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <systemd/sd-journal.h>
#include <syslog.h>
#include <termios.h>
#include <unistd.h>

Expand All @@ -24,7 +24,7 @@ check_panic_errno(int return_code, const std::string& tty_dev, const char* info)
}

std::string message = "infogetty(" + tty_dev + ") " + info + ": " + strerror(errno);
sd_journal_print(LOG_ERR, "%s", message.c_str());
syslog(LOG_ERR, "%s", message.c_str());
_exit(1);
}

Expand Down Expand Up @@ -145,7 +145,7 @@ parse_commandline_options(int argc, char** argv)
if (arg == "-u") {
++n;
if (n >= argc) {
sd_journal_print(LOG_ERR, "missing argument to -u switch");
syslog(LOG_ERR, "missing argument to -u switch");
_exit(1);
}
opts.login_user = argv[n];
Expand Down
4 changes: 2 additions & 2 deletions cpp/infogetty-cpp/network_info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <sys/socket.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <systemd/sd-journal.h>
#include <syslog.h>
#include <unistd.h>


Expand All @@ -41,7 +41,7 @@ check_panic_errno(int return_code, const char* info)
}

std::string message = std::string("infogetty: ") + info + ": " + strerror(errno);
sd_journal_print(LOG_ERR, "%s", message.c_str());
syslog(LOG_ERR, "%s", message.c_str());
_exit(1);
}

Expand Down
28 changes: 0 additions & 28 deletions third_party/BUILD.libsystemd.bazel

This file was deleted.

Loading