Updated CircleCI build/test image.

metasim · metasim · commit 81147bb597fe · 2021-09-22T16:31:47.000-04:00
diff --git a/.circleci/.dockerignore b/.circleci/.dockerignore
@@ -1,2 +1,3 @@
 *
 !requirements-conda.txt
+!fix-permissions
diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
@@ -19,12 +19,14 @@ RUN \
 ENV CONDA_DIR=/opt/conda
 ENV PATH=$CONDA_DIR/bin:$PATH
 
-COPY requirements-conda.txt /tmp
+COPY requirements-conda.txt fix-permissions /tmp
 RUN \
     conda install --quiet --yes --channel=conda-forge --file=/tmp/requirements-conda.txt && \
     echo "$CONDA_DIR/lib" > /etc/ld.so.conf.d/conda.conf && \
     ldconfig && \
-    conda clean --all --force-pkgs-dirs --yes --quiet
+    conda clean --all --force-pkgs-dirs --yes --quiet && \
+    sh /tmp/fix-permissions $CONDA_DIR
+
 
 # Work-around for pyproj issue https://github.com/pyproj4/pyproj/issues/415
 ENV PROJ_LIB=/opt/conda/share/proj
diff --git a/.circleci/Makefile b/.circleci/Makefile
@@ -1,11 +1,9 @@
 IMAGE_NAME=circleci-openjdk-conda-gdal
 SHA=$(shell git log -n1 --format=format:"%H" | cut -c 1-7)
 VERSION?=$(SHA)
-HOST=docker.pkg.github.com
-REPO=$(HOST)/locationtech/rasterframes
+HOST=docker.io
+REPO=$(HOST)/s22s
 FULL_NAME=$(REPO)/$(IMAGE_NAME):$(VERSION)
-GIT_USER?=metasim
-KEY?=$(HOME)/.github/repo-publish-key.txt
 
 .DEFAULT_GOAL := help
 help:
@@ -20,7 +18,7 @@ build: ## Build the docker image
 	docker build . -t ${FULL_NAME}
 
 login: ## Login to the docker registry
-	cat $(KEY) | docker login $(HOST) -u $(GIT_USER) --password-stdin
+	docker login
 
 push: login ## Push docker image to registry
 	docker push ${FULL_NAME}
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,11 +6,10 @@ orbs:
     executors:
       default:
         docker:
-          - image: s22s/miniconda-gdal:latest
+          - image: s22s/circleci-openjdk-conda-gdal:b8e30ee
         working_directory: ~/repo
         environment:
-          SBT_VERSION: 1.3.8
-          SBT_OPTS: -Xmx768m
+          _JAVA_OPTIONS: "-Xms32m -Xmx512m"
     commands:
       setup:
         description: Setup for sbt build
@@ -59,7 +58,7 @@ orbs:
               command: |
                 mkdir -p /tmp/core_dumps
                 ls -lh /tmp
-                cp core.* *.hs /tmp/core_dumps 2> /dev/null || true
+                cp core.* *.hs core/* /tmp/core_dumps 2> /dev/null || true
                 cp -r /tmp/hsperfdata* /tmp/*.hprof /tmp/core_dumps 2> /dev/null || true
               when: on_fail
 
@@ -79,8 +78,6 @@ orbs:
         steps:
           - run:
               command: |
-                mkdir -p /tmp/core_dumps
-                cp core.* *.hs /tmp/core_dumps 2> /dev/null || true
                 mkdir -p /tmp/markdown
                 cp /home/circleci/repo/pyrasterframes/target/python/docs/*.md /tmp/markdown 2> /dev/null || true
               when: on_fail
diff --git a/.circleci/fix-permissions b/.circleci/fix-permissions
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -e
+
+GID=3434 # circleci
+
+for d in "$@"; do
+  find "$d" \
+    ! \( \
+      -group $GID \
+      -a -perm -g+rwX  \
+    \) \
+    -exec chgrp $GID {} \; \
+    -exec chmod g+rwX {} \;
+  # setuid,setgid *on directories only*
+  find "$d" \
+    \( \
+        -type d \
+        -a ! -perm -6000  \
+    \) \
+    -exec chmod +6000 {} \;
+done

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`*`
`2`	`2`	`!requirements-conda.txt`
	`3`	`+!fix-permissions`