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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/.vscode/settings.json +18 -0
  2. package/package.json +1 -1
  3. package/src/docker-to-registry-py.mjs +2 -3
  4. package/src/templates/bashrcTemplatePy.hbs +5 -1
  5. package/src/templates/dockerfileTemplatePy.hbs +16 -36
package/.vscode/settings.json ADDED
@@ -0,0 +1,18 @@
1
+ {
2
+ "workbench.colorCustomizations": {
3
+ "commandCenter.border": "#e7e7e799",
4
+ "sash.hoverBorder": "#065782",
5
+ "statusBar.background": "#0877b3",
6
+ "statusBar.border": "#0877b3",
7
+ "statusBar.foreground": "#e7e7e7",
8
+ "statusBarItem.hoverBackground": "#0a97e4",
9
+ "statusBarItem.remoteBackground": "#0877b3",
10
+ "statusBarItem.remoteForeground": "#e7e7e7",
11
+ "titleBar.activeBackground": "#0877b3",
12
+ "titleBar.activeForeground": "#e7e7e7",
13
+ "titleBar.border": "#0877b3",
14
+ "titleBar.inactiveBackground": "#0877b399",
15
+ "titleBar.inactiveForeground": "#e7e7e799"
16
+ },
17
+ "peacock.color": "#0877b3"
18
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@leverege/build-tools",
3
- "version": "2.62.0-alpha.4",
3
+ "version": "2.62.0-alpha.6",
4
4
  "description": "A collection of build / support tools for Leverege developers",
5
5
  "main": "index.js",
6
6
  "repository": {
package/src/docker-to-registry-py.mjs CHANGED
@@ -17,7 +17,6 @@ import {
17
17
  shellCmd } from './Utils.mjs'
18
18
 
19
19
  import Docker from './DockerPy.mjs'
20
- import { version } from 'node:os'
21
20
 
22
21
  // refresh-npm-token does not throw so no need to try, but it emits in debug
23
22
  // const refreshErr = await shellCmd( 'refresh-npm-token' )
@@ -122,8 +121,8 @@ if ( giveGuidance ) {
122
121
  const registryFolder = `${artifactRegistry}/images/${containerName}`
123
122
 
124
123
  // Update the dependencies...
125
- log( chalk.green.bold( 'Updating dependencies and workspace...' ) )
126
- await shellCmd( 'npm install', { stdio : 'inherit' } )
124
+ // log( chalk.green.bold( 'Updating dependencies and workspace...' ) )
125
+ // await shellCmd( 'npm install', { stdio : 'inherit' } )
127
126
 
128
127
  if ( giveGuidance ) {
129
128
  await Docker.repoCleanup() // adjusts gitignore files and removes cruft
package/src/templates/bashrcTemplatePy.hbs CHANGED
@@ -1 +1,5 @@
1
- export PYTHONPYCACHEPREFIX=/tmp/pycache
1
+ export PYTHONPYCACHEPREFIX=/tmp/pycache
2
+
3
+ export VIRTUAL_ENV=/usr/src/app/.venv
4
+ export PATH="/usr/src/app/.venv/bin:$PATH"
5
+
package/src/templates/dockerfileTemplatePy.hbs CHANGED
@@ -1,14 +1,18 @@
1
1
  # Version {{regvers}} @ {{date}}
2
2
 
3
3
  # The FROM directive sets the Base Image for subsequent instructions
4
- FROM {{image}} as intermediate
4
+ FROM {{image}}
5
5
 
6
6
  ARG BUILD_ENV="{{buildEnv}}"
7
7
 
8
- RUN apt-get update && apt-get install -y \
9
- wget git
8
+ RUN useradd -ms /bin/bash {{runuser}} && \
9
+ mkdir -p /usr/src/app && \
10
+ chown {{runuser}} /usr/src/app && \
11
+ apt-get update && apt-get install -y \
12
+ wget git \
13
+ && rm -rf /var/lib/apt/lists/*
14
+
10
15
  # gcc \
11
- # git \
12
16
  # libgl1 \
13
17
  # libglib2.0-0 \
14
18
  # && rm -rf /var/lib/apt/lists/*
@@ -16,27 +20,22 @@ RUN apt-get update && apt-get install -y \
16
20
  # Copy uv binary from the official distroless Docker image.
17
21
  COPY --from=ghcr.io/astral-sh/uv:latest /uv /bin/uv
18
22
 
19
- # Define the working directory.
20
- WORKDIR /usr/src/app
21
-
22
- #ENV NODE_ENV production
23
- #ENV NPM_CONFIG_USERCONFIG /usr/src/app/.npmrc
24
-
25
- RUN mkdir -p /usr/src/app
26
23
  WORKDIR /usr/src/app
27
24
 
28
25
  # Install app dependencies
29
- COPY ./workspace/ /usr/src/app/
26
+ COPY --chown={{runuser}}:{{runuser}} ./workspace/ /usr/src/app/
30
27
  ENV GRPC_VERBOSITY ERROR
31
28
 
32
-
33
29
  # Setup pip.conf for Google Artifact Registry.
34
- RUN mkdir -p ~/.config/pip
35
- RUN echo "[global]" >> ~/.config/pip/pip.conf && \
30
+ RUN mkdir -p ~/.config/pip && \
31
+ echo "[global]" >> ~/.config/pip/pip.conf && \
36
32
  echo "break-system-packages = true" >> ~/.config/pip/pip.conf
37
33
 
38
34
 
39
35
  # Set up the virtual environment.
36
+ USER {{runuser}}
37
+ COPY --chown={{runuser}}:{{runuser}} ./bashrc /home/{{runuser}}/.bashrc
38
+
40
39
  RUN uv venv
41
40
  ENV VIRTUAL_ENV=/usr/src/app/.venv
42
41
  ENV PATH="$VIRTUAL_ENV/bin:$PATH"
@@ -45,31 +44,12 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
45
44
  RUN uv pip install keyring
46
45
  RUN uv pip install keyrings.google-artifactregistry-auth
47
46
 
48
- RUN echo "extra-index-url = https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple" >> ~/.config/pip/pip.conf
49
-
50
- ENV UV_EXTRA_INDEX_URL "https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple"
51
-
52
-
53
47
  {{preInstallPluginfile}}
54
48
 
55
- RUN cat
56
-
57
- RUN ls -al
58
- # Install uv
59
49
  RUN uv sync --keyring-provider subprocess --extra-index-url https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple
60
50
 
61
-
62
51
  # Pull in the Dockerfile.plugin file here
63
52
  {{pluginfile}}
64
53
 
65
- # Eliminate the sensitive info from the final stage image
66
- #RUN rm -f ${NPM_CONFIG_USERCONFIG}
67
-
68
- # ENTRYPOINT [ "tini", "--" ]
69
- #WORKDIR /usr/src/app
70
-
71
- #COPY --chown=node:node --from=intermediate /usr/src/app /usr/src/app
72
-
73
- USER {{runuser}}
74
- COPY ./bashrc /home/{{runuser}}/.bashrc
75
- CMD [ "/bin/bash", "-c", "source /home/{{runuser}}/.bashrc && python scripts/server.py" ]
54
+ RUN ls /usr/src/app/.venv/bin
55
+ CMD [ "/bin/bash", "-c", "source /home/{{runuser}}/.bashrc && python scripts/server.py" ]