From ada309531ea4f11893610c1c7094b557abbeeb3b Mon Sep 17 00:00:00 2001
From: jlee733 <75899901+jlee733@users.noreply.github.com>
Date: Wed, 18 Mar 2026 16:16:42 -0400
Subject: [PATCH] Revert "Docker"

---
 .github/workflows/docker.yml |  7 ++++---
 dockerfile                   | 37 ------------------------------------
 2 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 dockerfile

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 2b86bf8..9d9bcd8 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -19,6 +19,9 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -35,8 +38,6 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: dockerfile
+          file: .github/Dockerfile
           push: ${{ github.ref == 'refs/heads/main' }}
           tags: ${{ steps.tags.outputs.tags }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
diff --git a/dockerfile b/dockerfile
deleted file mode 100644
index 5d8c460..0000000
--- a/dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM python:3.10-slim AS stage1
-
-FROM mambaorg/micromamba:1.5.5 AS stage2
-
-FROM debian:stable-slim AS final
-
-RUN apt-get update && apt-get install -y ca-certificates
-
-COPY --from=stage1 /usr/local /usr/local
-COPY --from=stage2 /bin/micromamba /usr/local/bin/micromamba
-
-ENV MAMBA_ROOT_PREFIX="/root/micromamba" \
-    CONDA_PREFIX="/root/micromamba/envs/mdx2-dev" \
-    PATH="/root/micromamba/envs/mdx2-dev/bin:/usr/local/bin:/opt/conda/bin:$PATH"
-
-# Ensure /opt/conda exists for micromamba to use
-RUN mkdir -p /opt/conda
-
-WORKDIR /home/dev
-
-COPY env.yaml .
-
-# Use micromamba to create the environment and install packages
-RUN --mount=type=cache,target=/root/micromamba/pkgs \
-    /usr/local/bin/micromamba create -f env.yaml -n mdx2-dev && \
-    /usr/local/bin/micromamba install -y -n mdx2-dev nexpy jupyterlab jupyterlab-h5web dials xia2 wget tar -c conda-forge
-
-COPY . .
-
-RUN --mount=type=cache,target=/root/.cache/pip \
-    /usr/local/bin/micromamba run -n mdx2-dev pip install -e . && \
-    /usr/local/bin/micromamba run -n mdx2-dev pip install jupyterhub jupyter-vscode-proxy
-
-EXPOSE 8888
-
-CMD ["/usr/local/bin/micromamba", "run", "-n", "mdx2-dev", "jupyterhub-singleuser"]
-