More fixes

.drone.yml

@@ -0,0 +1,9 @@
+pipeline:
+  docker-environment:
+    image: plugins/docker
+    registry: registry.makerforce.io
+    secrets: [ docker_username, docker_password ]
+    repo: registry.makerforce.io/ambrose/chromiumos-builder
+    target: sdk
+    tags:
+      - latest

Dockerfile

@@ -10,6 +10,11 @@ RUN ./fetch-repo.sh
 FROM scratch as sdk
 
 COPY --from=sdk-download /sdk /
+COPY --from=sdk-download /depot_tools /home/chronos/depot_tools/
+
+COPY fetch-source.sh /usr/local/bin/
+COPY setup-root.sh /usr/local/bin/
+COPY full-build.sh /usr/local/bin/
 
 # fix COPY permissions
 RUN chmod +s /usr/bin/sudo
@@ -17,11 +22,8 @@ RUN chown -R chronos:chronos /home/chronos
 # fix home directory
 RUN usermod -d /home/chronos chronos
 
-COPY fetch-source.sh /usr/local/bin/
-COPY setup-root.sh /usr/local/bin/
-
 # setup PATH beforehand
-ENV PATH=$PATH:/opt/depot_tools:/home/chronos/trunk/chromite/bin
+ENV PATH=$PATH:/home/chronos/trunk/chromite/bin:/home/chronos/depot_tools
 # enable passwordless sudo
 RUN echo "chronos ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 

fetch-repo.sh

@@ -6,6 +6,6 @@ apk add --no-cache git
 
 # See http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up
 echo "Getting depot_tools"
-git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git /sdk/opt/depot_tools
-rm -rf /sdk/opt/depot_tools/.git
+git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git /depot_tools
+rm -rf /depot_tools/.git
 

setup-root.sh

@@ -5,6 +5,7 @@ set -e
 SUDO_USER=chronos
 
 CHROOT_TRUNK_DIR=/home/chronos/trunk
+DEPOT_TOOLS_DIR=/home/chronos/depot_tools
 SRC_ROOT=${CHROOT_TRUNK_DIR}/src
 SCRIPT_ROOT=${SRC_ROOT}/scripts
 
@@ -74,7 +75,7 @@ ln -s ../../cache/chromeos-cache/distfiles/target \
   "/var/lib/portage/distfiles-target"
 target="/etc/env.d/99chromiumos"
 cat <<EOF > "${target}"
-PATH="${CHROOT_TRUNK_DIR}/chromite/bin:${DEPOT_TOOLS_DIR}"
+PATH="${CHROOT_TRUNK_DIR}/chromite/bin:${DEPOT_TOOLS_DIR}:$PATH"
 CROS_WORKON_SRCROOT="${CHROOT_TRUNK_DIR}"
 PORTAGE_USERNAME="${SUDO_USER}"
 EOF
@@ -127,8 +128,9 @@ TOOLCHAIN_ARGS=( --deleteold )
     --hostonly "${TOOLCHAIN_ARGS[@]}"
 emerge -uNv $USEPKG --select $EMERGE_JOBS \
   pbzip2 dev-libs/openssl net-misc/curl sudo app-portage/gentoolkit
+set -e
 "${CHROOT_TRUNK_DIR}/src/scripts/build_library/perl_rebuild.sh"
-"${CHROOT_TRUNK_DIR}/src/scripts/run_chroot_version_hooks" --init_latest
+sudo -u "${SUDO_USER}" "${CHROOT_TRUNK_DIR}/src/scripts/run_chroot_version_hooks" --init_latest
 UPDATE_ARGS=( --skip_toolchain_update )
-"${CHROOT_TRUNK_DIR}/src/scripts/update_chroot" "${UPDATE_ARGS[@]}"
+sudo -u "${SUDO_USER}" "${CHROOT_TRUNK_DIR}/src/scripts/update_chroot" "${UPDATE_ARGS[@]}"
 java-config --set-system-vm 1