@sw-tsdk/connector 3.23.0-alpha.7b1fa57 → 3.23.0-alpha.992d283

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 +3 -14
  2. package/lib/templates/python_311_definition_fips/Dockerfile +3 -14
  3. package/lib/templates/python_312_definition_fips/Dockerfile +3 -14
  4. package/lib/templates/python_39_definition_fips/Dockerfile +3 -14
  5. package/package.json +5 -5
package/lib/templates/python_310_definition_fips/Dockerfile CHANGED
@@ -1,27 +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
- <<<<<<< Updated upstream
19
- COPY --from=compile-base-libs /usr/local/lib /usr/local/lib
20
- COPY --from=compile-base-libs /usr/local/bin /usr/local/bin
21
- =======
22
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.10-latest /usr/local/lib /usr/local/lib
23
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.10-latest /usr/local/bin /usr/local/bin
24
- >>>>>>> Stashed changes
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
25
14
 
26
15
  # Run compile-time OS package installs and custom scripts
27
16
  COPY compile.* /scripts/
@@ -49,7 +38,7 @@ ENV ASSET_KEYS=$ASSET_KEYS
49
38
 
50
39
  # Copy only the connector-specific packages into site-packages.
51
40
  # The runner's own FIPS Python installation remains intact.
52
- COPY --from=builder /connector-deps /usr/local/lib/python3.10/site-packages/
41
+ COPY --from=builder /connector-deps /usr/lib/python3.10/site-packages/
53
42
 
54
43
  COPY connector /app
55
44
  WORKDIR /app
package/lib/templates/python_311_definition_fips/Dockerfile CHANGED
@@ -1,27 +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
- <<<<<<< Updated upstream
19
- COPY --from=compile-base-libs /usr/local/lib /usr/local/lib
20
- COPY --from=compile-base-libs /usr/local/bin /usr/local/bin
21
- =======
22
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.11-latest /usr/local/lib /usr/local/lib
23
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.11-latest /usr/local/bin /usr/local/bin
24
- >>>>>>> Stashed changes
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
25
14
 
26
15
  # Run compile-time OS package installs and custom scripts
27
16
  COPY compile.* /scripts/
@@ -49,7 +38,7 @@ ENV ASSET_KEYS=$ASSET_KEYS
49
38
 
50
39
  # Copy only the connector-specific packages into site-packages.
51
40
  # The runner's own FIPS Python installation remains intact.
52
- COPY --from=builder /connector-deps /usr/local/lib/python3.11/site-packages/
41
+ COPY --from=builder /connector-deps /usr/lib/python3.11/site-packages/
53
42
 
54
43
  COPY connector /app
55
44
  WORKDIR /app
package/lib/templates/python_312_definition_fips/Dockerfile CHANGED
@@ -1,27 +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
- <<<<<<< Updated upstream
19
- COPY --from=compile-base-libs /usr/local/lib /usr/local/lib
20
- COPY --from=compile-base-libs /usr/local/bin /usr/local/bin
21
- =======
22
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.12-latest /usr/local/lib /usr/local/lib
23
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.12-latest /usr/local/bin /usr/local/bin
24
- >>>>>>> Stashed changes
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
25
14
 
26
15
  # Run compile-time OS package installs and custom scripts
27
16
  COPY compile.* /scripts/
@@ -49,7 +38,7 @@ ENV ASSET_KEYS=$ASSET_KEYS
49
38
 
50
39
  # Copy only the connector-specific packages into site-packages.
51
40
  # The runner's own FIPS Python installation remains intact.
52
- COPY --from=builder /connector-deps /usr/local/lib/python3.12/site-packages/
41
+ COPY --from=builder /connector-deps /usr/lib/python3.12/site-packages/
53
42
 
54
43
  COPY connector /app
55
44
  WORKDIR /app
package/lib/templates/python_39_definition_fips/Dockerfile CHANGED
@@ -1,27 +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
- <<<<<<< Updated upstream
19
- COPY --from=compile-base-libs /usr/local/lib /usr/local/lib
20
- COPY --from=compile-base-libs /usr/local/bin /usr/local/bin
21
- =======
22
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.9-latest /usr/local/lib /usr/local/lib
23
- COPY --from=quay.io/swimlane-connectors/connector-python-compile-definition-base-fips:3.9-latest /usr/local/bin /usr/local/bin
24
- >>>>>>> Stashed changes
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
25
14
 
26
15
  # Run compile-time OS package installs and custom scripts
27
16
  COPY compile.* /scripts/
@@ -49,7 +38,7 @@ ENV ASSET_KEYS=$ASSET_KEYS
49
38
 
50
39
  # Copy only the connector-specific packages into site-packages.
51
40
  # The runner's own FIPS Python installation remains intact.
52
- COPY --from=builder /connector-deps /usr/local/lib/python3.9/site-packages/
41
+ COPY --from=builder /connector-deps /usr/lib/python3.9/site-packages/
53
42
 
54
43
  COPY connector /app
55
44
  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.7b1fa57",
13
- "@sw-tsdk/core": "3.23.0-alpha.7b1fa57",
14
- "@sw-tsdk/docker": "3.23.0-alpha.7b1fa57",
12
+ "@sw-tsdk/common": "3.23.0-alpha.992d283",
13
+ "@sw-tsdk/core": "3.23.0-alpha.992d283",
14
+ "@sw-tsdk/docker": "3.23.0-alpha.992d283",
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.7b1fa57",
70
- "gitHead": "7b1fa574ec5c8585697336ca1e78c78e4b503a2b"
69
+ "version": "3.23.0-alpha.992d283",
70
+ "gitHead": "992d283c0f2251e86f7203ea809f77bc96636af3"
71
71
  }