Update Dockerfile for improved directory structure and permissions

Author: elesiuta

.github/workflows/publish-docker.yaml

@@ -7,6 +7,7 @@ on:
       - testnet
   release:
     types: [created]
+  workflow_dispatch: null
 
 env:
   REGISTRY: ghcr.io
@@ -39,7 +40,6 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image for testnet branch
-        if: github.ref == 'refs/heads/testnet'
         id: push-testnet
         uses: docker/build-push-action@v5
         with:
@@ -52,7 +52,6 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: Generate artifact attestation for testnet
-        if: github.ref == 'refs/heads/testnet'
         id: attest-testnet
         uses: actions/attest-build-provenance@v1
         with:

Dockerfile

@@ -19,56 +19,64 @@ RUN apt update && \
     gosu \
     && apt clean && rm -rf /var/lib/apt/lists/*
 
+# Make directories under opt and set owner to ubuntu
+RUN mkdir -p /opt/.cargo /opt/.rustup /opt/.nvm /opt/.npm /opt/.snarkjs /opt/omron/neurons && \
+    chown -R ubuntu:ubuntu /opt && \
+    chmod -R 775 /opt/omron && \
+    chown root:root /opt
+
 # Use ubuntu user
 USER ubuntu
-WORKDIR /home/ubuntu
+WORKDIR /opt
 
 # Install Rust
 ENV RUST_TOOLCHAIN=nightly-2024-09-30
+ENV CARGO_HOME=/opt/.cargo
+ENV RUSTUP_HOME=/opt/.rustup
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
-    ~/.cargo/bin/rustup toolchain install ${RUST_TOOLCHAIN} && \
-    ~/.cargo/bin/rustup default ${RUST_TOOLCHAIN} && \
-    ~/.cargo/bin/rustup toolchain remove stable
-ENV PATH="~/.cargo/bin:${PATH}"
+    /opt/.cargo/bin/rustup toolchain install ${RUST_TOOLCHAIN} && \
+    /opt/.cargo/bin/rustup default ${RUST_TOOLCHAIN} && \
+    /opt/.cargo/bin/rustup toolchain remove stable && \
+    chmod -R 775 /opt/.cargo /opt/.rustup
+ENV PATH="/opt/.cargo/bin:${PATH}"
 
 # Install Jolt
 #ENV JOLT_VERSION=dd9e5c4bcf36ffeb75a576351807f8d86c33ec66
 #RUN cargo +${RUST_TOOLCHAIN} install --git https://github.com/a16z/jolt --rev ${JOLT_VERSION} --force --bins jolt
 
 # Install node et al.
+ENV NVM_DIR=/opt/.nvm
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.0/install.sh | bash && \
-    export NVM_DIR="/home/ubuntu/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" && \
     nvm install 20 && \
-    npm install --prefix /home/ubuntu/.snarkjs snarkjs@0.7.4 && \
+    npm install --prefix /opt/.snarkjs snarkjs@0.7.4 && \
     mkdir -p ~/.local/bin && \
     ln -s $(which node) /home/ubuntu/.local/bin/node && \
-    ln -s $(which npm) /home/ubuntu/.local/bin/npm
+    ln -s $(which npm) /home/ubuntu/.local/bin/npm && \
+    chmod -R 775 /opt/.nvm /opt/.npm /opt/.snarkjs
 ENV PATH="/home/ubuntu/.local/bin:${PATH}"
 
 # Copy omron and install Python dependencies (make sure owner is ubuntu)
-COPY neurons /home/ubuntu/omron/neurons
-COPY pyproject.toml /home/ubuntu/omron/pyproject.toml
-COPY uv.lock /home/ubuntu/omron/uv.lock
-USER root
-RUN chown -R ubuntu:ubuntu /home/ubuntu/omron
-USER ubuntu
+COPY --chown=ubuntu:ubuntu --chmod=775 neurons /opt/omron/neurons
+COPY --chown=ubuntu:ubuntu --chmod=775 pyproject.toml /opt/omron/pyproject.toml
+COPY --chown=ubuntu:ubuntu --chmod=775 uv.lock /opt/omron/uv.lock
 RUN pipx install uv && \
-    cd ~/omron && \
+    cd /opt/omron && \
     ~/.local/bin/uv sync --locked --no-dev --compile-bytecode && \
     ~/.local/bin/uv cache clean && \
-    echo "source ~/omron/.venv/bin/activate" >> ~/.bashrc
-ENV PATH="/home/ubuntu/omron/.venv/bin:${PATH}"
+    echo "source /opt/omron/.venv/bin/activate" >> ~/.bashrc && \
+    chmod -R 775 /opt/omron/.venv
+ENV PATH="/opt/omron/.venv/bin:${PATH}"
 
 # Set workdir for running miner.py or validator.py and compile circuits
-WORKDIR /home/ubuntu/omron/neurons
+WORKDIR /opt/omron/neurons
 ENV OMRON_NO_AUTO_UPDATE=1
-RUN OMRON_DOCKER_BUILD=1 /home/ubuntu/omron/.venv/bin/python3 miner.py && \
-    rm -rf ~/omron/neurons/deployment_layer/*/target/release/build && \
-    rm -rf ~/omron/neurons/deployment_layer/*/target/release/deps && \
-    rm -rf ~/omron/neurons/deployment_layer/*/target/release/examples && \
-    rm -rf ~/omron/neurons/deployment_layer/*/target/release/incremental && \
+RUN OMRON_DOCKER_BUILD=1 /opt/omron/.venv/bin/python3 miner.py && \
+    rm -rf /opt/omron/neurons/deployment_layer/*/target/release/build && \
+    rm -rf /opt/omron/neurons/deployment_layer/*/target/release/deps && \
+    rm -rf /opt/omron/neurons/deployment_layer/*/target/release/examples && \
+    rm -rf /opt/omron/neurons/deployment_layer/*/target/release/incremental && \
     rm -rf ~/.bittensor && \
     rm -rf /tmp/omron
 USER root
@@ -78,21 +86,21 @@ set -e
 if [ -n "$PUID" ]; then
     if [ "$PUID" = "0" ]; then
         echo "Running as root user"
-        /home/ubuntu/omron/.venv/bin/python3 "$@"
+        /opt/omron/.venv/bin/python3 "$@"
     else
         echo "Changing ubuntu user id to $PUID"
         usermod -u "$PUID" ubuntu
-        gosu ubuntu /home/ubuntu/omron/.venv/bin/python3 "$@"
+        gosu ubuntu /opt/omron/.venv/bin/python3 "$@"
     fi
 else
-    gosu ubuntu /home/ubuntu/omron/.venv/bin/python3 "$@"
+    gosu ubuntu /opt/omron/.venv/bin/python3 "$@"
 fi
 EOF
 RUN chmod +x /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["-c", "import subprocess; \
-    subprocess.run(['/home/ubuntu/omron/.venv/bin/python3', '/home/ubuntu/omron/neurons/miner.py', '--help']); \
-    subprocess.run(['/home/ubuntu/omron/.venv/bin/python3', '/home/ubuntu/omron/neurons/validator.py', '--help']);" \
+    subprocess.run(['/opt/omron/.venv/bin/python3', '/opt/omron/neurons/miner.py', '--help']); \
+    subprocess.run(['/opt/omron/.venv/bin/python3', '/opt/omron/neurons/validator.py', '--help']);" \
     ]
 # Axon server
 EXPOSE 8091/tcp