Skip to content

Commit

Permalink
Merge pull request #50 from nmfs-opensci/eeholmes-patch-1
Browse files Browse the repository at this point in the history
Eeholmes patch 1
  • Loading branch information
eeholmes authored Oct 16, 2024
2 parents 519af4c + 35ee393 commit 3d4c36e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch: null
push:
branches:
- dev2
- dev
paths:
- 'apt.txt'
- 'environment.yml'
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Checkout files in repo
uses: actions/checkout@main
with:
ref: dev2
ref: dev

- name: Build and push the image to quay.io
uses: jupyterhub/repo2docker-action@master
Expand Down
4 changes: 4 additions & 0 deletions rocker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ while IFS= read -r line; do
if [[ "$line" == ENV* ]]; then
# Assign variable
var_assignment=$(echo "$line" | sed 's/^ENV //g')
# Replace ENV DEFAULT_USER="jovyan"
if [[ "$var_assignment" == DEFAULT_USER* ]]; then
var_assignment="DEFAULT_USER=${NB_USER}"
fi
# Run this way eval "export ..." otherwise the " will get turned to %22
eval "export $var_assignment"
# Write the exported variable to env.txt
Expand Down

0 comments on commit 3d4c36e

Please sign in to comment.