@leverege/build-tools 2.62.0-alpha.5 → 2.62.0-alpha.6

package/.vscode/settings.json

@@ -0,0 +1,18 @@
+{
+  "workbench.colorCustomizations": {
+    "commandCenter.border": "#e7e7e799",
+    "sash.hoverBorder": "#065782",
+    "statusBar.background": "#0877b3",
+    "statusBar.border": "#0877b3",
+    "statusBar.foreground": "#e7e7e7",
+    "statusBarItem.hoverBackground": "#0a97e4",
+    "statusBarItem.remoteBackground": "#0877b3",
+    "statusBarItem.remoteForeground": "#e7e7e7",
+    "titleBar.activeBackground": "#0877b3",
+    "titleBar.activeForeground": "#e7e7e7",
+    "titleBar.border": "#0877b3",
+    "titleBar.inactiveBackground": "#0877b399",
+    "titleBar.inactiveForeground": "#e7e7e799"
+  },
+  "peacock.color": "#0877b3"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.62.0-alpha.5",
+  "version": "2.62.0-alpha.6",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/templates/bashrcTemplatePy.hbs

@@ -1 +1,5 @@
-export PYTHONPYCACHEPREFIX=/tmp/pycache
+export PYTHONPYCACHEPREFIX=/tmp/pycache
+
+export VIRTUAL_ENV=/usr/src/app/.venv
+export PATH="/usr/src/app/.venv/bin:$PATH"
+

package/src/templates/dockerfileTemplatePy.hbs

@@ -1,14 +1,18 @@
 # Version {{regvers}} @ {{date}}
 
 # The FROM directive sets the Base Image for subsequent instructions
-FROM {{image}} as intermediate
+FROM {{image}}
 
 ARG BUILD_ENV="{{buildEnv}}"
 
-RUN apt-get update && apt-get install -y \
-    wget git
+RUN useradd -ms /bin/bash {{runuser}} && \
+    mkdir -p /usr/src/app && \
+    chown {{runuser}} /usr/src/app && \
+    apt-get update && apt-get install -y \
+    wget git \
+    && rm -rf /var/lib/apt/lists/*
+
 #    gcc \
-#    git \
 #    libgl1 \
 #    libglib2.0-0 \
 #    && rm -rf /var/lib/apt/lists/*
@@ -16,27 +20,22 @@ RUN apt-get update && apt-get install -y \
 # Copy uv binary from the official distroless Docker image.
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /bin/uv
 
-# Define the working directory.
-WORKDIR /usr/src/app
-
-#ENV NODE_ENV production
-#ENV NPM_CONFIG_USERCONFIG /usr/src/app/.npmrc
-
-RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 # Install app dependencies
-COPY ./workspace/ /usr/src/app/
+COPY --chown={{runuser}}:{{runuser}} ./workspace/ /usr/src/app/
 ENV GRPC_VERBOSITY ERROR
 
-
 # Setup pip.conf for Google Artifact Registry.
-RUN mkdir -p ~/.config/pip
-RUN echo "[global]" >> ~/.config/pip/pip.conf && \
+RUN mkdir -p ~/.config/pip && \
+    echo "[global]" >> ~/.config/pip/pip.conf && \
     echo "break-system-packages = true" >> ~/.config/pip/pip.conf 
 
 
 # Set up the virtual environment.
+USER {{runuser}}
+COPY --chown={{runuser}}:{{runuser}} ./bashrc /home/{{runuser}}/.bashrc
+
 RUN uv venv
 ENV VIRTUAL_ENV=/usr/src/app/.venv
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
@@ -45,31 +44,12 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 RUN uv pip install keyring
 RUN uv pip install keyrings.google-artifactregistry-auth
 
-RUN echo "extra-index-url = https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple" >> ~/.config/pip/pip.conf
-
-ENV UV_EXTRA_INDEX_URL "https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple"
-
-
 {{preInstallPluginfile}}
 
-RUN cat 
-
-RUN ls -al
-# Install uv
 RUN uv sync --keyring-provider subprocess --extra-index-url https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple
 
-
 # Pull in the Dockerfile.plugin file here
 {{pluginfile}}
 
-# Eliminate the sensitive info from the final stage image
-#RUN rm -f ${NPM_CONFIG_USERCONFIG}
-
-# ENTRYPOINT [ "tini", "--" ]
-#WORKDIR /usr/src/app
-
-#COPY --chown=node:node --from=intermediate /usr/src/app /usr/src/app
-
-USER {{runuser}}
-COPY ./bashrc /home/{{runuser}}/.bashrc
-CMD [ "/bin/bash", "-c", "source /home/{{runuser}}/.bashrc && python scripts/server.py" ]
+RUN ls /usr/src/app/.venv/bin
+CMD [ "/bin/bash", "-c", "source /home/{{runuser}}/.bashrc && python scripts/server.py" ]