apache · nicknezis · Mar 25, 2022 · Feb 27, 2022 · Feb 27, 2022 · Feb 27, 2022
diff --git a/WORKSPACE b/WORKSPACE
@@ -177,7 +177,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "com_github_johnynek_bazel_jar_jar",
-    commit = "171f268569384c57c19474b04aebe574d85fde0d",  # Latest commit SHA as at 2019/02/13
+    commit = "171f268569384c57c19474b04aebe574d85fde0d", # Latest commit SHA as at 2019/02/13
     remote = "https://github.com/johnynek/bazel_jar_jar.git",
     shallow_since = "1594234634 -1000",
 )
@@ -189,6 +189,16 @@ load(
 
 jar_jar_repositories()
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_archive(
+    name = "platforms",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz",
+        "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz",
+    ],
+    sha256 = "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407",
+)
+
 http_archive(
     name = "rules_python",
     sha256 = "b6d46438523a3ec0f3cead544190ee13223a52f6a6765a29eae7b7cc24cc83a0",

diff --git a/docker/compile/Dockerfile.centos7 b/docker/compile/Dockerfile.centos7
@@ -68,5 +68,4 @@ RUN /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3 /usr/bin/python3 \
       && /usr/bin/ln -sfT /opt/rh/devtoolset-8/root/bin/g++ /usr/bin/g++ \
       && /usr/bin/ln -sfT /opt/rh/devtoolset-8/root/bin/cpp /usr/bin/cpp
 
-ADD bazelrc /root/.bazelrc
 ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/docker/compile/Dockerfile.debian10 b/docker/compile/Dockerfile.debian10
@@ -17,9 +17,6 @@
 
 FROM openjdk:11.0.6-jdk-buster
 
-# This is passed to the heron build command via the --config flag
-ENV TARGET_PLATFORM linux
-
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
 
@@ -52,5 +49,4 @@ RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/
       && /tmp/bazel.sh \
       && rm -rf /tmp/bazel.sh
 
-ADD bazelrc /root/.bazelrc
 ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/docker/compile/Dockerfile.rocky8 b/docker/compile/Dockerfile.rocky8
@@ -17,11 +17,8 @@
 
 FROM rockylinux:8.5
 
-# This is passed to the heron build command via the --config flag
-ENV TARGET_PLATFORM linux
-
-RUN yum -y upgrade
-RUN yum -y install \
+RUN yum -y upgrade \
+   && yum -y install \
       ant \
       automake \
       curl \
@@ -57,5 +54,4 @@ RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/
       && /tmp/bazel.sh \
       && rm -rf /tmp/bazel.sh
 
-ADD bazelrc /root/.bazelrc
 ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/docker/compile/Dockerfile.ubuntu18.04 b/docker/compile/Dockerfile.ubuntu18.04
@@ -17,9 +17,6 @@
 
 FROM ubuntu:18.04
 
-# This is passed to the heron build command via the --config flag
-ENV TARGET_PLATFORM linux
-
 ARG DEBIAN_FRONTEND=noninteractive
 
 ENV LC_ALL C.UTF-8
@@ -57,5 +54,4 @@ RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/
       && /tmp/bazel.sh \
       && rm -rf /tmp/bazel.sh
 
-ADD bazelrc /root/.bazelrc
 ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/docker/compile/Dockerfile.ubuntu20.04 b/docker/compile/Dockerfile.ubuntu20.04
@@ -17,9 +17,6 @@
 
 FROM ubuntu:20.04
 
-# This is passed to the heron build command via the --config flag
-ENV TARGET_PLATFORM linux
-
 ARG DEBIAN_FRONTEND=noninteractive
 
 ENV LC_ALL C.UTF-8
@@ -54,5 +51,4 @@ RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/
       && /tmp/bazel.sh \
       && rm -rf /tmp/bazel.sh
 
-ADD bazelrc /root/.bazelrc
 ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/docker/compile/Dockerfile.ubuntu22.04 b/docker/compile/Dockerfile.ubuntu22.04
@@ -17,14 +17,12 @@
 
 FROM ubuntu:22.04
 
-# This is passed to the heron build command via the --config flag
-ENV TARGET_PLATFORM ubuntu
-
 ARG DEBIAN_FRONTEND=noninteractive
 
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
 
+# Docker 20.10.10 or older will not work
 RUN apt-get update && apt-get -y install \
       ant \
       g++ \
@@ -54,5 +52,4 @@ RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/
       && /tmp/bazel.sh \
       && rm -rf /tmp/bazel.sh
 
-ADD bazelrc /root/.bazelrc
 ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/docker/dist/Dockerfile.dist.rocky8 b/docker/dist/Dockerfile.dist.rocky8
@@ -18,7 +18,7 @@
 #syntax=docker/dockerfile:1.2
 FROM rockylinux:8.5
 
-RUN yum -y install epel-release \
+RUN yum -y upgrade \
     && yum -y install \
     curl \
     java-11-openjdk-headless \

diff --git a/docker/dist/Dockerfile.dist.ubuntu20.04 b/docker/dist/Dockerfile.dist.ubuntu20.04
@@ -23,6 +23,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
 
+# Docker 20.10.10 or older will not work
 RUN apt-get -y update \
     && apt-get -y install \
     curl \

diff --git a/docker/dist/Dockerfile.dist.ubuntu22.04 b/docker/dist/Dockerfile.dist.ubuntu22.04
@@ -0,0 +1,66 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+#syntax=docker/dockerfile:1.2
+FROM ubuntu:22.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+ENV LC_ALL C.UTF-8
+ENV LANG C.UTF-8
+
+# Docker 20.10.10 or older will not work
+RUN apt-get -y update \
+    && apt-get -y install \
+    curl \
+    openjdk-11-jdk-headless \
+    netcat-openbsd \
+    python3 \
+    python3-distutils \
+    supervisor \
+    unzip \
+    && apt-get clean
+
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
+RUN update-ca-certificates -f
+
+# run Heron installer
+RUN --mount=type=bind,source=artifacts,target=/tmp/heron /tmp/heron/heron-install.sh \
+    && rm -f /usr/local/heron/dist/heron-core.tar.gz
+
+WORKDIR /heron
+
+RUN ln -s /usr/local/heron/dist/heron-core /heron \
+    && mkdir -p /heron/heron-tools \
+    && ln -s /usr/local/heron/bin /heron/heron-tools \
+    && ln -s /usr/local/heron/conf /heron/heron-tools \
+    && ln -s /usr/local/heron/dist /heron/heron-tools \
+    && ln -s /usr/local/heron/lib /heron/heron-tools \
+    && ln -s /usr/local/heron/release.yaml /heron/heron-tools \
+    && ln -s /usr/local/heron/examples /heron \
+    && ln -s /usr/local/heron/release.yaml /heron
+
+ENV HERON_HOME /heron/heron-core/
+RUN export HERON_HOME
+
+# install Zookeeper
+ARG ZK_DIST=zookeeper-3.5.8
+
+RUN --mount=type=bind,source=dist,target=/opt/heron-docker/ sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST
+
+ADD dist/conf/zookeeper.conf /opt/zookeeper/conf/zookeeper.conf
+ADD dist/conf/sandbox.conf /etc/supervisor/conf.d/
diff --git a/docker/scripts/compile-docker.sh b/docker/scripts/compile-docker.sh
@@ -36,13 +36,8 @@ dockerfile_path_for_platform() {
   echo "$SCRATCH_DIR/compile/Dockerfile.$1"
 }
 
-copy_bazel_rc_to() {
-  cp $PROJECT_DIR/tools/docker/bazel.rc $1
-}
-
 DOCKER_FILE=$(dockerfile_path_for_platform $TARGET_PLATFORM)
 verify_dockerfile_exists $DOCKER_FILE
-copy_bazel_rc_to $SCRATCH_DIR/bazelrc
 
 echo "Building heron-compiler container"
 docker buildx build -t heron-compiler:$TARGET_PLATFORM -f $DOCKER_FILE $SCRATCH_DIR

diff --git a/docker/scripts/compile-platform.sh b/docker/scripts/compile-platform.sh
@@ -36,29 +36,14 @@ cd $SCRATCH_DIR
 echo "Extracting source"
 tar -C . -xzf $SOURCE_TARBALL
 
-if [[ "$TARGET_PLATFORM" =~ "ubuntu" ]]; then
-  CONFIG_PLATFORM=linux_nostyle
-elif [[ "$TARGET_PLATFORM" =~ "centos" ]]; then
-  CONFIG_PLATFORM=linux_nostyle
-elif [[ "$TARGET_PLATFORM" =~ "rocky" ]]; then
-  CONFIG_PLATFORM=linux_nostyle
-elif [[ "$TARGET_PLATFORM" =~ "debian" ]]; then
-  CONFIG_PLATFORM=linux_nostyle
-elif [[ "$TARGET_PLATFORM" =~ "darwin" ]]; then
-  CONFIG_PLATFORM=darwin_nostyle
-else
-  echo "Unknown platform: $TARGET_PLATFORM"
-  exit 1
-fi
-
 bazel version
 ./bazel_configure.py
 bazel clean
 
 echo "Creating packages"
-bazel build -c opt --jobs 25 --config=$CONFIG_PLATFORM scripts/packages:tarpkgs
-bazel build -c opt --jobs 25 --config=$CONFIG_PLATFORM scripts/packages:binpkgs
-bazel build -c opt --jobs 25 --config=$CONFIG_PLATFORM scripts/images:heron.tar
+bazel build -c opt --copt=-O3 scripts/packages:tarpkgs
+bazel build -c opt --copt=-O3 scripts/packages:binpkgs
+bazel build -c opt --copt=-O3 scripts/images:heron.tar
 
 echo "Moving packages to /$OUTPUT_DIRECTORY"
 for file in ./bazel-bin/scripts/packages/*.tar.gz; do

diff --git a/docker/scripts/dev-env-create.sh b/docker/scripts/dev-env-create.sh
@@ -28,8 +28,8 @@
 # After the container is started, you can build Heron with bazel
 # (ubuntu config is used in the example):
 #   ./bazel_configure.py
-#   bazel build --config=linux heron/...
-#   bazel build --config=linux scripts/packages:binpkgs
+#   bazel build heron/...
+#   bazel build scripts/packages:binpkgs
 
 set -o nounset
 set -o errexit
@@ -69,7 +69,6 @@ dockerfile_path_for_platform() {
 
 copy_extra_files() {
   mkdir -p $SCRATCH_DIR/scripts
-  cp $PROJECT_DIR/tools/docker/bazel.rc $SCRATCH_DIR/bazelrc
   cp $DOCKER_DIR/scripts/compile-docker.sh $SCRATCH_DIR/scripts/compile-platform.sh
 }
 

diff --git a/docker/scripts/test-docker.sh b/docker/scripts/test-docker.sh
@@ -36,13 +36,8 @@ dockerfile_path_for_platform() {
   echo "$SCRATCH_DIR/test/Dockerfile.$1"
 }
 
-copy_bazel_rc_to() {
-  cp $PROJECT_DIR/tools/docker/bazel.rc $1
-}
-
 DOCKER_FILE=$(dockerfile_path_for_platform $TARGET_PLATFORM)
 verify_dockerfile_exists $DOCKER_FILE
-copy_bazel_rc_to  $SCRATCH_DIR/bazelrc
 
 echo "Building heron-compiler container"
 docker buildx build -t heron-compiler:$TARGET_PLATFORM -f $DOCKER_FILE $SCRATCH_DIR

diff --git a/docker/scripts/test-platform.sh b/docker/scripts/test-platform.sh
@@ -36,28 +36,12 @@ cd $SCRATCH_DIR
 echo "Extracting source"
 tar -C . -xzf $SOURCE_TARBALL
 
-if [[ "$TARGET_PLATFORM" =~ "ubuntu" ]]; then
-  CONFIG_PLATFORM=linux_nostyle
-elif [[ "$TARGET_PLATFORM" =~ "centos" ]]; then
-  CONFIG_PLATFORM=linux_nostyle
-elif [[ "$TARGET_PLATFORM" =~ "rocky" ]]; then
-  CONFIG_PLATFORM=linux_nostyle
-elif [[ "$TARGET_PLATFORM" =~ "darwin" ]]; then
-  CONFIG_PLATFORM=darwin
-elif [[ "$TARGET_PLATFORM" =~ "debian" ]]; then
-  CONFIG_PLATFORM=linux_nostyle
-else
-  echo "Unknown platform: $TARGET_PLATFORM"
-  exit 1
-fi
-
 bazel version
 ./bazel_configure.py
 bazel clean
 
 echo "UnitTest"
-bazel test -c opt --jobs 25 \
-    --config=$CONFIG_PLATFORM \
+bazel test -c opt \
     --test_output=all \
     --test_summary=detailed \
     heron/... \

diff --git a/docker/test/Dockerfile.centos7 b/docker/test/Dockerfile.centos7
@@ -17,10 +17,6 @@
 
 FROM centos:centos7
 
-# This is passed to the heron build command via the --config flag
-ENV TARGET_PLATFORM linux
-ENV LC_ALL en_US.utf8
-
 RUN yum -y upgrade && yum -y install centos-release-scl-rh
 RUN yum -y install \
       automake \
@@ -31,6 +27,7 @@ RUN yum -y install \
       devtoolset-8-gcc \
       devtoolset-8-gcc-c++ \
       git \
+      glibc-langpack-en \
       kernel-devel \
       libtool \
       make \
@@ -51,6 +48,7 @@ RUN /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3 /usr/bin/python3 \
       && /usr/bin/ln -sfT /opt/rh/devtoolset-8/root/bin/g++ /usr/bin/g++ \
       && /usr/bin/ln -sfT /opt/rh/devtoolset-8/root/bin/cpp /usr/bin/cpp
 
+ENV LC_ALL en_US.utf8
 ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
 
 ENV bazelVersion 4.2.2
@@ -59,5 +57,4 @@ RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/
       && chmod +x /tmp/bazel.sh \
       && /tmp/bazel.sh
 
-ADD bazelrc /root/.bazelrc
 ADD scripts/test-platform.sh /test-platform.sh
diff --git a/docker/test/Dockerfile.rocky8 b/docker/test/Dockerfile.rocky8
@@ -20,8 +20,8 @@ FROM rockylinux:8.5
 # This is passed to the heron build command via the --config flag
 ENV TARGET_PLATFORM linux
 
-RUN yum -y upgrade
-RUN yum -y install \
+RUN yum -y upgrade \
+   && yum -y install \
       automake \
       curl \
       cmake \

diff --git a/docker/test/Dockerfile.ubuntu18.04 b/docker/test/Dockerfile.ubuntu18.04
@@ -17,8 +17,8 @@
 
 FROM ubuntu:18.04
 
-# This is passed to the heron build command via the --config flag
-ENV TARGET_PLATFORM linux
+ENV LC_ALL C.UTF-8
+ENV LANG C.UTF-8
 
 RUN apt-get update && apt-get -y install \
       g++ \
@@ -47,5 +47,4 @@ RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/
       && chmod +x /tmp/bazel.sh \
       && /tmp/bazel.sh
 
-ADD bazelrc /root/.bazelrc
 ADD scripts/test-platform.sh /test-platform.sh
diff --git a/examples/src/scala/compile.sh b/examples/src/scala/compile.sh
@@ -32,7 +32,7 @@ function die {
 which scalac || die "scalac must be installed to run this script. Exiting."
 
 rm -f heron-storm.jar
-(cd $root && bazel build --config=darwin scripts/packages:tarpkgs)
+(cd $root && bazel build scripts/packages:tarpkgs)
 
 # Verify storm and heron bolts compile with heron-storm.jar
 scalac -cp bazel-bin/./storm-compatibility/v0.10.2/src/java/heron-storm.jar \

diff --git a/heron/common/src/cpp/basics/BUILD b/heron/common/src/cpp/basics/BUILD
@@ -54,7 +54,7 @@ cc_library(
         "@com_github_corvusoft_kashmir_cpp//:kashmir-cxx",
         "@com_google_protobuf//:protobuf",
     ] + select({
-        "//tools/platform:darwin": [],
+        "@platforms//os:osx": [],
         "//conditions:default": ["@org_nongnu_libunwind//:libunwind"],
     }),
 )