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

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.
@@ -15,8 +15,13 @@ FROM ${PYTHON_DEV_IMAGE} AS builder
15
15
  USER root
16
16
 
17
17
  # Carry over pre-installed swimlane SDK packages from the compile-fips base
18
+ <<<<<<< Updated upstream
18
19
  COPY --from=compile-base-libs /usr/local/lib /usr/local/lib
19
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
20
25
 
21
26
  # Run compile-time OS package installs and custom scripts
22
27
  COPY compile.* /scripts/
@@ -15,8 +15,13 @@ FROM ${PYTHON_DEV_IMAGE} AS builder
15
15
  USER root
16
16
 
17
17
  # Carry over pre-installed swimlane SDK packages from the compile-fips base
18
+ <<<<<<< Updated upstream
18
19
  COPY --from=compile-base-libs /usr/local/lib /usr/local/lib
19
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
20
25
 
21
26
  # Run compile-time OS package installs and custom scripts
22
27
  COPY compile.* /scripts/
@@ -15,8 +15,13 @@ FROM ${PYTHON_DEV_IMAGE} AS builder
15
15
  USER root
16
16
 
17
17
  # Carry over pre-installed swimlane SDK packages from the compile-fips base
18
+ <<<<<<< Updated upstream
18
19
  COPY --from=compile-base-libs /usr/local/lib /usr/local/lib
19
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
20
25
 
21
26
  # Run compile-time OS package installs and custom scripts
22
27
  COPY compile.* /scripts/
@@ -15,8 +15,13 @@ FROM ${PYTHON_DEV_IMAGE} AS builder
15
15
  USER root
16
16
 
17
17
  # Carry over pre-installed swimlane SDK packages from the compile-fips base
18
+ <<<<<<< Updated upstream
18
19
  COPY --from=compile-base-libs /usr/local/lib /usr/local/lib
19
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
20
25
 
21
26
  # Run compile-time OS package installs and custom scripts
22
27
  COPY compile.* /scripts/
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.22.0",
13
- "@sw-tsdk/core": "3.22.0",
14
- "@sw-tsdk/docker": "3.22.0",
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",
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.22.0",
70
- "gitHead": "c34f8958c7c6b90778f7de18611eba5fe3ef7cd4"
69
+ "version": "3.23.0-alpha.7b1fa57",
70
+ "gitHead": "7b1fa574ec5c8585697336ca1e78c78e4b503a2b"
71
71
  }