@sw-tsdk/connector 3.23.0-alpha.24827b5 → 3.23.0-alpha.623668b

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/lib/templates/python_310_definition_fips/Dockerfile +7 -10
  2. package/lib/templates/python_311_definition_fips/Dockerfile +7 -9
  3. package/lib/templates/python_312_definition_fips/Dockerfile +7 -10
  4. package/lib/templates/python_39_definition_fips/Dockerfile +7 -11
  5. package/package.json +5 -5
package/lib/templates/python_310_definition_fips/Dockerfile CHANGED
@@ -1,23 +1,16 @@
1
1
  # syntax=docker/dockerfile:1.2
2
- ARG COMPILE_BASE=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.10-latest
3
-
4
2
  ARG PYTHON_DEV_IMAGE=quay.io/swimlane-connectors/connector-python-dev-definition-base-fips:3.10-latest
5
3
 
6
4
  ARG RUNNER_IMAGE_NAME=quay.io/swimlane-connectors/connector-python-runner-definition-base-fips:3.10-latest
7
5
  ARG RUNTIME_IMAGE=runtime-image
8
6
 
9
- # Stage 1: reference-only — pull the published compile-fips base to copy pre-installed swimlane libs
10
- FROM ${COMPILE_BASE} AS compile-base-libs
11
- LABEL stage=compile-base-libs
12
- # Stage 2: builder — dev image has shell, apk, and pip for all build-time operations.
7
+ # Stage 1: builder — dev image has shell, apk, and pip for all build-time operations.
13
8
  # The final FIPS image is distroless (no shell), so ALL RUN commands must happen here.
14
9
  FROM ${PYTHON_DEV_IMAGE} AS builder
15
10
  USER root
16
11
 
17
12
  # Carry over pre-installed swimlane SDK packages from the compile-fips base
18
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.10-latest /usr/local/lib /usr/local/lib
19
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.10-latest /usr/local/bin /usr/local/bin
20
-
13
+ COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.10-latest /usr/lib/python3.10/site-packages /usr/lib/python3.10/site-packages
21
14
 
22
15
  # Run compile-time OS package installs and custom scripts
23
16
  COPY compile.* /scripts/
@@ -43,9 +36,13 @@ USER root
43
36
  ARG ASSET_KEYS
44
37
  ENV ASSET_KEYS=$ASSET_KEYS
45
38
 
39
+ # Copy compile-fips base packages (e.g. connector_definition_runner, pylint, black, etc.)
40
+ # from the builder stage so they are available at runtime.
41
+ COPY --from=builder /usr/lib/python3.10/site-packages /usr/lib/python3.10/site-packages/
42
+
46
43
  # Copy only the connector-specific packages into site-packages.
47
44
  # The runner's own FIPS Python installation remains intact.
48
- COPY --from=builder /connector-deps /usr/local/lib/python3.10/site-packages/
45
+ COPY --from=builder /connector-deps /usr/lib/python3.10/site-packages/
49
46
 
50
47
  COPY connector /app
51
48
  WORKDIR /app
package/lib/templates/python_311_definition_fips/Dockerfile CHANGED
@@ -1,22 +1,16 @@
1
1
  # syntax=docker/dockerfile:1.2
2
- ARG COMPILE_BASE=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.11-latest
3
-
4
2
  ARG PYTHON_DEV_IMAGE=quay.io/swimlane-connectors/connector-python-dev-definition-base-fips:3.11-latest
5
3
 
6
4
  ARG RUNNER_IMAGE_NAME=quay.io/swimlane-connectors/connector-python-runner-definition-base-fips:3.11-latest
7
5
  ARG RUNTIME_IMAGE=runtime-image
8
6
 
9
- # Stage 1: reference-only — pull the published compile-fips base to copy pre-installed swimlane libs
10
- FROM ${COMPILE_BASE} AS compile-base-libs
11
- LABEL stage=compile-base-libs
12
- # Stage 2: builder — dev image has shell, apk, and pip for all build-time operations.
7
+ # Stage 1: builder — dev image has shell, apk, and pip for all build-time operations.
13
8
  # The final FIPS image is distroless (no shell), so ALL RUN commands must happen here.
14
9
  FROM ${PYTHON_DEV_IMAGE} AS builder
15
10
  USER root
16
11
 
17
12
  # Carry over pre-installed swimlane SDK packages from the compile-fips base
18
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.11-latest /usr/local/lib /usr/local/lib
19
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.11-latest /usr/local/bin /usr/local/bin
13
+ COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.11-latest /usr/lib/python3.11/site-packages /usr/lib/python3.11/site-packages
20
14
 
21
15
  # Run compile-time OS package installs and custom scripts
22
16
  COPY compile.* /scripts/
@@ -42,9 +36,13 @@ USER root
42
36
  ARG ASSET_KEYS
43
37
  ENV ASSET_KEYS=$ASSET_KEYS
44
38
 
39
+ # Copy compile-fips base packages (e.g. connector_definition_runner, pylint, black, etc.)
40
+ # from the builder stage so they are available at runtime.
41
+ COPY --from=builder /usr/lib/python3.11/site-packages /usr/lib/python3.11/site-packages/
42
+
45
43
  # Copy only the connector-specific packages into site-packages.
46
44
  # The runner's own FIPS Python installation remains intact.
47
- COPY --from=builder /connector-deps /usr/local/lib/python3.11/site-packages/
45
+ COPY --from=builder /connector-deps /usr/lib/python3.11/site-packages/
48
46
 
49
47
  COPY connector /app
50
48
  WORKDIR /app
package/lib/templates/python_312_definition_fips/Dockerfile CHANGED
@@ -1,23 +1,16 @@
1
1
  # syntax=docker/dockerfile:1.2
2
- ARG COMPILE_BASE=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.12-latest
3
-
4
2
  ARG PYTHON_DEV_IMAGE=quay.io/swimlane-connectors/connector-python-dev-definition-base-fips:3.12-latest
5
3
 
6
4
  ARG RUNNER_IMAGE_NAME=quay.io/swimlane-connectors/connector-python-runner-definition-base-fips:3.12-latest
7
5
  ARG RUNTIME_IMAGE=runtime-image
8
6
 
9
- # Stage 1: reference-only — pull the published compile-fips base to copy pre-installed swimlane libs
10
- FROM ${COMPILE_BASE} AS compile-base-libs
11
- LABEL stage=compile-base-libs
12
- # Stage 2: builder — dev image has shell, apk, and pip for all build-time operations.
7
+ # Stage 1: builder — dev image has shell, apk, and pip for all build-time operations.
13
8
  # The final FIPS image is distroless (no shell), so ALL RUN commands must happen here.
14
9
  FROM ${PYTHON_DEV_IMAGE} AS builder
15
10
  USER root
16
11
 
17
12
  # Carry over pre-installed swimlane SDK packages from the compile-fips base
18
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.12-latest /usr/local/lib /usr/local/lib
19
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.12-latest /usr/local/bin /usr/local/bin
20
-
13
+ COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.12-latest /usr/lib/python3.12/site-packages /usr/lib/python3.12/site-packages
21
14
 
22
15
  # Run compile-time OS package installs and custom scripts
23
16
  COPY compile.* /scripts/
@@ -43,9 +36,13 @@ USER root
43
36
  ARG ASSET_KEYS
44
37
  ENV ASSET_KEYS=$ASSET_KEYS
45
38
 
39
+ # Copy compile-fips base packages (e.g. connector_definition_runner, pylint, black, etc.)
40
+ # from the builder stage so they are available at runtime.
41
+ COPY --from=builder /usr/lib/python3.12/site-packages /usr/lib/python3.12/site-packages/
42
+
46
43
  # Copy only the connector-specific packages into site-packages.
47
44
  # The runner's own FIPS Python installation remains intact.
48
- COPY --from=builder /connector-deps /usr/local/lib/python3.12/site-packages/
45
+ COPY --from=builder /connector-deps /usr/lib/python3.12/site-packages/
49
46
 
50
47
  COPY connector /app
51
48
  WORKDIR /app
package/lib/templates/python_39_definition_fips/Dockerfile CHANGED
@@ -1,24 +1,16 @@
1
1
  # syntax=docker/dockerfile:1.2
2
- ARG COMPILE_BASE=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.9-latest
3
-
4
2
  ARG PYTHON_DEV_IMAGE=quay.io/swimlane-connectors/connector-python-dev-definition-base-fips:3.9-latest
5
3
 
6
4
  ARG RUNNER_IMAGE_NAME=quay.io/swimlane-connectors/connector-python-runner-definition-base-fips:3.9-latest
7
5
  ARG RUNTIME_IMAGE=runtime-image
8
6
 
9
- # Stage 1: reference-only — pull the published compile-fips base to copy pre-installed swimlane libs
10
- FROM ${COMPILE_BASE} AS compile-base-libs
11
- LABEL stage=compile-base-libs
12
- # Stage 2: builder — dev image has shell, apk, and pip for all build-time operations.
7
+ # Stage 1: builder — dev image has shell, apk, and pip for all build-time operations.
13
8
  # The final FIPS image is distroless (no shell), so ALL RUN commands must happen here.
14
9
  FROM ${PYTHON_DEV_IMAGE} AS builder
15
10
  USER root
16
11
 
17
12
  # Carry over pre-installed swimlane SDK packages from the compile-fips base
18
-
19
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.9-latest /usr/local/lib /usr/local/lib
20
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.9-latest /usr/local/bin /usr/local/bin
21
-
13
+ COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.9-latest /usr/lib/python3.9/site-packages /usr/lib/python3.9/site-packages
22
14
 
23
15
  # Run compile-time OS package installs and custom scripts
24
16
  COPY compile.* /scripts/
@@ -44,9 +36,13 @@ USER root
44
36
  ARG ASSET_KEYS
45
37
  ENV ASSET_KEYS=$ASSET_KEYS
46
38
 
39
+ # Copy compile-fips base packages (e.g. connector_definition_runner, pylint, black, etc.)
40
+ # from the builder stage so they are available at runtime.
41
+ COPY --from=builder /usr/lib/python3.9/site-packages /usr/lib/python3.9/site-packages/
42
+
47
43
  # Copy only the connector-specific packages into site-packages.
48
44
  # The runner's own FIPS Python installation remains intact.
49
- COPY --from=builder /connector-deps /usr/local/lib/python3.9/site-packages/
45
+ COPY --from=builder /connector-deps /usr/lib/python3.9/site-packages/
50
46
 
51
47
  COPY connector /app
52
48
  WORKDIR /app
package/package.json CHANGED
@@ -9,9 +9,9 @@
9
9
  "@oclif/core": "2.8.5",
10
10
  "@oclif/plugin-help": "5.2.9",
11
11
  "@oclif/plugin-plugins": "3.1.2",
12
- "@sw-tsdk/common": "3.23.0-alpha.24827b5",
13
- "@sw-tsdk/core": "3.23.0-alpha.24827b5",
14
- "@sw-tsdk/docker": "3.23.0-alpha.24827b5",
12
+ "@sw-tsdk/common": "3.23.0-alpha.623668b",
13
+ "@sw-tsdk/core": "3.23.0-alpha.623668b",
14
+ "@sw-tsdk/docker": "3.23.0-alpha.623668b",
15
15
  "@swimlane/connector-interfaces": "1.11.0",
16
16
  "@swimlane/cosign": "1.4.1",
17
17
  "archiver": "5.3.1",
@@ -66,6 +66,6 @@
66
66
  "test": "jest --passWithNoTests"
67
67
  },
68
68
  "types": "lib/index.d.ts",
69
- "version": "3.23.0-alpha.24827b5",
70
- "gitHead": "24827b5a6055cf3592906d105357ae5589c04efc"
69
+ "version": "3.23.0-alpha.623668b",
70
+ "gitHead": "623668b3d88f645e1b519284f26b9a33ab26a26f"
71
71
  }