Skip to content

Commit

Permalink
renamings
Browse files Browse the repository at this point in the history
  • Loading branch information
achtsnits committed Sep 7, 2023
1 parent e4cc775 commit 1a40331
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Build edc
name: Build jupyter

on:
push:
tags:
- "edc-*"
- "jupyter-*"

jobs:
build_and_push:
Expand All @@ -24,7 +24,7 @@ jobs:

- name: Get the tag
id: get_image_tag
run: echo ::set-output name=TAG::${GITHUB_REF/refs\/tags\/edc-/}
run: echo ::set-output name=TAG::${GITHUB_REF/refs\/tags\/jupyter-/}

# NOTE: this step is necessary because otherwise the build-push-action can't push /o\
# https://github.com/docker/build-push-action/issues/100#issuecomment-715352826
Expand All @@ -41,9 +41,9 @@ jobs:
uses: docker/build-push-action@v2
with:
push: true
file: Dockerfile-edc
file: Dockerfile-jupyter
tags: |
${{ steps.login-ecr.outputs.registry }}/eurodatacube-edc:${{ steps.get_image_tag.outputs.TAG }}
eurodatacube/edc:${{ steps.get_image_tag.outputs.TAG }}
${{ steps.login-ecr.outputs.registry }}/eurodatacube-jupyter:${{ steps.get_image_tag.outputs.TAG }}
eurodatacube/jupyter:${{ steps.get_image_tag.outputs.TAG }}
build-args: |
DOCKER_TAG=${{ steps.get_image_tag.outputs.TAG }}
DOCKER_TAG=${{ steps.get_image_tag.outputs.TAG }}
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push-xcube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ jobs:
${{ steps.login-ecr.outputs.registry }}/eurodatacube-xcube:${{ steps.get_image_tag.outputs.TAG }}
eurodatacube/xcube:${{ steps.get_image_tag.outputs.TAG }}
build-args: |
DOCKER_TAG=${{ steps.get_image_tag.outputs.TAG }}
DOCKER_TAG=${{ steps.get_image_tag.outputs.TAG }}
8 changes: 4 additions & 4 deletions Dockerfile-edc → Dockerfile-jupyter
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ RUN mkdir /opt/conda/pkgs \

USER $NB_UID

ADD --chown=1000 kernel-edc.yaml /tmp
ADD --chown=1000 kernel-jupyter.yaml /tmp

RUN pip config set global.cache-dir false && \
mamba env create \
-p /opt/conda/envs/edc-default-${BASE_IMAGE_TAG} \
-f /tmp/kernel-edc.yaml && \
-f /tmp/kernel-jupyter.yaml && \
mamba clean --all -f -y && \
rm /tmp/kernel-edc.yaml && \
rm /tmp/kernel-jupyter.yaml && \
pip config set global.cache-dir true

USER root
Expand All @@ -54,4 +54,4 @@ RUN mkdir /etc/jupyter \
# Need to downgrade edc-jlab in jupyterlab conda env from base image
RUN mamba run -n default python3 -m pip install https://github.com/eurodatacube/edc-jlab/raw/master/dist/edc_jlab-0.5.15-py3-none-any.whl

USER $NB_UID
USER $NB_UID
2 changes: 1 addition & 1 deletion Dockerfile-xcube
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ WORKDIR /home/$MAMBA_USER

ENTRYPOINT ["/usr/local/bin/_entrypoint.sh"]

CMD xcube --help
CMD xcube --help
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# base-images

docker base images used on https://eurodatacube.com
docker base-images used on https://eurodatacube.com
File renamed without changes.

0 comments on commit 1a40331

Please sign in to comment.