INST-2193 - Fix add locale and set env C.UTF-8

Author: srinivasgowda097

WORKSPACE

@@ -39,15 +39,15 @@ dpkg_src(
     arch = "amd64",
     distro = "buster",
     sha256 = "e096054471ae9a772fa67006cd0d9a0b125bb30443625fb6b66935e2a9331e98",
-    snapshot = "20210216T023642Z",
+    snapshot = "20210216T210840Z",
     url = "https://snapshot.debian.org/archive",
 )
 
 dpkg_src(
     name = "debian_buster_security",
-    package_prefix = "https://snapshot.debian.org/archive/debian-security/20210215T180445Z/",
-    packages_gz_url = "https://snapshot.debian.org/archive/debian-security/20210215T180445Z/dists/buster/updates/main/binary-amd64/Packages.gz",
-    sha256 = "666dad92ef97c05f72264ab570ccb4059e6993cc00c823b427a93f1f3349743e",
+    package_prefix = "https://snapshot.debian.org/archive/debian-security/20210216T201258Z/",
+    packages_gz_url = "https://snapshot.debian.org/archive/debian-security/20210216T201258Z/dists/buster/updates/main/binary-amd64/Packages.gz",
+    sha256 = "979b105c890ce629a002d66c79b67381c5b78b4769abbeddad3a57225c1c1159",
 )
 
 dpkg_list(
@@ -56,6 +56,7 @@ dpkg_list(
         # Version required to skip a security fix to the pre-release library
         # TODO: Remove when there is a security fix or dpkg_list finds the recent version
         "libc6",
+        "libc-bin",
         "base-files",
         "ca-certificates",
         "openssl",
@@ -125,8 +126,8 @@ http_file(
 http_file(
     name = "busybox",
     executable = True,
-    sha256 = "233d850e3927bb99d8fcb9a55930cac0c8ad41eaad6a8fc2b02c4e0f88acf042",
-    urls = ["https://deepscan.jfrog.io/deepscan/distroless-generic/busybox/busybox-1.32.1.tar.xz"],
+    sha256 = "9c1cc2735e2ea21c4579be452b313ce4120866a8c2b9dfc45bb7f9bf02d34949",
+    urls = ["https://deepscan.jfrog.io/deepscan/distroless-generic/busybox/1.32.1-glibc-busybox.tar.xz"],
 )
 
 #Added complied and slimed curl binary from source https://github.com/curl/curl/releases

base/BUILD

@@ -46,12 +46,18 @@ pkg_tar(
 
 load("@package_bundle//file:packages.bzl", "packages")
 load("//cacerts:cacerts.bzl", "cacerts")
+load("//locale:locale.bzl", "locale")
 
 cacerts(
     name = "cacerts",
     deb = packages["ca-certificates"],
 )
 
+locale(
+    name = "locale",
+    deb = packages["libc-bin"],
+)
+
 # Create /tmp, too many things assume it exists.
 # tmp.tar has a /tmp with the correct permissions 01777
 # A tar is needed because at the moment there is no way to create a
@@ -63,6 +69,7 @@ docker_build(
         packages["base-files"],
         packages["netbase"],
         packages["tzdata"],
+        packages["libc-bin"],
         ":cacerts.deb",
     ],
     env = {
@@ -71,6 +78,7 @@ docker_build(
         # TODO: We should run update-ca-certifaces, but that requires "openssl rehash"
         # which would probably need to be run inside the container
         "SSL_CERT_FILE": "/etc/ssl/certs/ca-certificates.crt",
+        "LANG": "C.UTF-8",
     },
     tars = [
         ":passwd",

base/artifactory-sh/BUILD

@@ -63,12 +63,18 @@ pkg_tar(
 
 load("@package_bundle//file:packages.bzl", "packages")
 load("//cacerts:cacerts.bzl", "cacerts")
+load("//locale:locale.bzl", "locale")
 
 cacerts(
     name = "cacerts",
     deb = packages["ca-certificates"],
 )
 
+locale(
+    name = "locale",
+    deb = packages["libc-bin"],
+)
+
 # Create /tmp, too many things assume it exists.
 # tmp.tar has a /tmp with the correct permissions 01777
 # A tar is needed because at the moment there is no way to create a

base/testdata/debug.yaml

@@ -26,4 +26,4 @@ commandTests:
   # Check ps cmd
   - name: ps
     command: ["ps"]
-    exitCode: 0
+    exitCode: 0

java/BUILD

@@ -3,17 +3,24 @@ package(default_visibility = ["//visibility:public"])
 load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")
 load("@package_bundle//file:packages.bzl", "packages")
 load("//cacerts:java.bzl", "cacerts_java")
+load("//locale:locale.bzl", "locale")
 load("@io_bazel_rules_docker//java:image.bzl", "java_image")
 
 cacerts_java(
     name = "cacerts_java",
 )
 
+locale(
+    name = "locale",
+    deb = packages["libc-bin"],
+)
+
 docker_build(
     name = "java-base",
     base = "//cc:debug",
     debs = [
         packages["zlib1g"],
+        packages["libc-bin"],
         packages["net-tools"],
         packages["libprocps7"],
         packages["procps"],
@@ -40,8 +47,10 @@ docker_build(
     ],
     stamp = True,
     entrypoint = ["/busybox/sh"],
-
-    tars = [":cacerts_java"],
+    env = {
+        "LANG": "C.UTF-8",
+    },
+    tars = [":cacerts_java",":locale",],
 )
 
 docker_build(

locale/BUILD

@@ -0,0 +1,6 @@
+package(default_visibility = ["//visibility:public"])
+
+sh_binary(
+    name = "extract_locale",
+    srcs = ["extract.sh"],
+)

locale/extract.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -o errexit
+
+DEB=$1
+OUT_TAR=$2
+
+ar -x "$DEB" data.tar.xz
+
+tar -xf data.tar.xz ./usr/lib/locale/C.UTF-8 ./usr/share/doc/libc-bin/copyright
+
+rm data.tar.xz
+
+# On Mac OS, you need to make sure that GNU Tar is used instead of the BSD tar that is shipped with MacOS.
+# To resolve this you can install gnu-tar via Homebrew and symlink it as /usr/local/bin/tar.
+tar -c --owner=0 --group=0 -f locale.tar ./usr
+
+mv locale.tar "$OUT_TAR"
+
+rm -rf usr

locale/locale.bzl

@@ -0,0 +1,33 @@
+"""A rule to unpack c locale from the debian package."""
+
+def _impl(ctx):
+    ctx.actions.run(
+        executable = ctx.executable._extract,
+        arguments = [
+            ctx.file.deb.path,
+            ctx.outputs.tar.path,
+        ],
+        inputs = [ctx.file.deb],
+        outputs = [ctx.outputs.tar],
+    )
+
+locale = rule(
+    attrs = {
+        "deb": attr.label(
+            allow_single_file = [".deb"],
+            mandatory = True,
+        ),
+        # Implicit dependencies.
+        "_extract": attr.label(
+            default = Label("//locale:extract_locale"),
+            cfg = "host",
+            executable = True,
+            allow_files = True,
+        ),
+    },
+    executable = False,
+    outputs = {
+        "tar": "%{name}.tar",
+    },
+    implementation = _impl,
+)