Merge pull request #37 from LSSTDESC/dev

Bring working dir updates to main branch
LSSTDESC · Mar 31, 2022 · d822114 · d822114
2 parents 9d93efa + 6539a27
commit d822114
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.github/workflows/td-env-docker-dev.yml b/.github/workflows/td-env-docker-dev.yml
@@ -31,8 +31,12 @@ jobs:
         docker run -u root -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE --name="install-mpich" lsstsqre/centos:7-stack-lsst_distrib-w_2022_10 /bin/bash /$GITHUB_WORKSPACE/docker/install-mpich.sh
         docker commit -m"initial testing" install-mpich lsstdesc/td-dev:mpich
         docker run -u lsst -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE -w $GITHUB_WORKSPACE/conda --name="td-test-env" lsstdesc/td-dev:mpich /bin/bash /$GITHUB_WORKSPACE/docker/update-docker.sh ${{env.LSST_TAG}}
-        docker commit -m"initial testing" td-test-env lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev
+        docker commit -m"initial testing" td-test-env lsstdesc/td-dev:test
+        docker run -u lsst -w /opt/lsst/software/stack --name="td-setwd" lsstdesc/td-dev:test /bin/bash
+        docker commit -m"initial testing" td-setwd lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev
     - name: Test and push
       run: |
         docker run --rm lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev /bin/bash -c "source /opt/lsst/software/stack/loadLSST.bash && setup lsst_distrib && python -c 'import coloredlogs'"
         docker push lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev
+        docker tag lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev lsstdesc/td-env:dev
+        docker push lsstdesc/td-env:dev