Skip to content

Commit

Permalink
Bump magic castle version to 14.0.0-beta.2
Browse files Browse the repository at this point in the history
  • Loading branch information
cmd-ntrf committed Sep 20, 2024
1 parent 95b8e81 commit 8bf2593
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
env:
IMAGE_NAME: "cmdntrf/mc-hub"
RUN_LIVE_CLUSTER_TESTS: ${{ (github.event.inputs.force_build_live_cluster == 'yes' || startsWith(github.ref, 'refs/tags/v')) && 'true' || 'false' }}
MAGIC_CASTLE_VERSION: 12.6.8
MAGIC_CASTLE_VERSION: 14.0.0-beta.2

jobs:
frontend:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ RUN apt-get update && \
pip install poetry

ENV MAGIC_CASTLE_PATH=/magic_castle
ENV MAGIC_CASTLE_VERSION=12.6.8
ENV MAGIC_CASTLE_VERSION=14.0.0-beta.2
RUN curl -L https://github.com/ComputeCanada/magic_castle/releases/download/${MAGIC_CASTLE_VERSION}/magic_castle-openstack-${MAGIC_CASTLE_VERSION}.tar.gz -o magic_castle.tar.gz && \
tar xvf magic_castle.tar.gz && \
mv magic_castle-* ${MAGIC_CASTLE_PATH} && \
chown -R root:root ${MAGIC_CASTLE_PATH}

ENV TERRAFORM_VERSION 1.3.9
ENV TERRAFORM_VERSION 1.5.7
RUN TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_$(dpkg --print-architecture).zip" && \
curl -L ${TERRAFORM_URL} -o terraform.zip && \
unzip terraform.zip -d /usr/local/bin
Expand Down Expand Up @@ -70,7 +70,7 @@ RUN mkdir -p /home/mcu/clusters /home/mcu/database /home/mcu/credentials /home/m
ADD .terraformrc /home/mcu

ENV MAGIC_CASTLE_PATH=/magic_castle
ENV MAGIC_CASTLE_VERSION=12.6.8
ENV MAGIC_CASTLE_VERSION=14.0.0-beta.2
ENV MCH_DIST_PATH=/code/frontend

CMD python3 -m mchub.schema_update --clean && \
Expand Down
2 changes: 1 addition & 1 deletion mchub/configuration/magic_castle.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
)
TERRAFORM_REQUIRED_VERSION = ">= 1.2.1"

MAGIC_CASTLE_VERSION = environ.get("MAGIC_CASTLE_VERSION", "12.6.8")
MAGIC_CASTLE_VERSION = environ.get("MAGIC_CASTLE_VERSION", "14.0.0-beta.2")
MAGIC_CASTLE_PATH = environ.get("MAGIC_CASTLE_PATH", "git")
if MAGIC_CASTLE_PATH == "git":
MAGIC_CASTLE_SOURCE = {
Expand Down

0 comments on commit 8bf2593

Please sign in to comment.