Open vvcb opened 6 months ago
Have reverted the change that caused the problem from this branch. We need to be careful about future PR's, from release branches. I forgot that merge conflicts cause all the changes to be reflected in the source branch. Will have to factor this in to the branching strategy moving forward.
After the revert I've checked to see if this has applied correctly and i can see that it was successfully applied:
NAME AGE READY STATUS
jupyter 36d True Applied revision: release/0.2.62@sha1:21921b5473351123c90489353cc31b50d218affe
and that the workspace binding that caused the conflict in the first place is there
NAMESPACE NAME WORKSPACE EXPIRES STATUS COMMENTS
jupyterhub uhmb-generic-workspace-dale-wright uhmb-generic-workspace 2030-12-31
I do think that we need to move workspace management out on it's own so that we can manage these separately, this was only supposed to be a stop-gap solution after all.
Between image versions
datascience-notebook-default:0.1.0
anddatascience-notebook-default:0.1.19
we seem to have lost RStudio, Code and XCFE.This is likely a consequence of the multiple changes made to the repo to allow this to work on non-AMD architectures.
This is no longer a requirement and if it becomes a requirement in future, we will have to rethink how we do this.
Solution: Revert changes back to how they were previously (at 0.1.0) and tag that as the latest version.