Skip to content

Commit f8d9414

Browse files
authored
Merge branch 'main' into cos-to-sql
2 parents 4c0fd6c + 0c47e7b commit f8d9414

File tree

73 files changed

+2034
-317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2034
-317
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*.out
22
node_modules
3-
.DS_Store
3+
.DS_Store
4+
.vscode

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/projectquay/golang:1.22 AS build-env
1+
FROM quay.io/projectquay/golang:1.23 AS build-env
22
WORKDIR /go/src/app
33
COPY ./helloworld .
44
COPY codeengine.go .

app-n-event-notification/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module destination-app
22

3-
go 1.21.0
3+
go 1.23.0
44

55
require (
66
github.com/IBM/code-engine-go-sdk v0.0.0-20230622184111-3ab23ea2d678
@@ -23,7 +23,7 @@ require (
2323
github.com/mitchellh/mapstructure v1.5.0 // indirect
2424
github.com/oklog/ulid v1.3.1 // indirect
2525
go.mongodb.org/mongo-driver v1.11.3 // indirect
26-
golang.org/x/crypto v0.31.0 // indirect
27-
golang.org/x/sys v0.28.0 // indirect
28-
golang.org/x/text v0.21.0 // indirect
26+
golang.org/x/crypto v0.35.0 // indirect
27+
golang.org/x/sys v0.30.0 // indirect
28+
golang.org/x/text v0.22.0 // indirect
2929
)

app-n-event-notification/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,22 @@ go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAV
8989
go.mongodb.org/mongo-driver v1.11.3 h1:Ql6K6qYHEzB6xvu4+AU0BoRoqf9vFPcc4o7MUIdPW8Y=
9090
go.mongodb.org/mongo-driver v1.11.3/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g=
9191
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
92-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
93-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
92+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
93+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
9494
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
9595
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
9696
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
9797
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
9898
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
9999
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
100100
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
101-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
102-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
101+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
102+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
103103
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
104104
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
105105
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
106-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
107-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
106+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
107+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
108108
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
109109
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
110110
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

app2job/Dockerfile.app

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/projectquay/golang:1.22 AS build-env
1+
FROM quay.io/projectquay/golang:1.23 AS build-env
22
WORKDIR /go/src/app
33
COPY app.go .
44

app2job/Dockerfile.job

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/projectquay/golang:1.22 AS build-env
1+
FROM quay.io/projectquay/golang:1.23 AS build-env
22
WORKDIR /go/src/app
33
COPY job.go .
44

auth/Dockerfile.app

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/projectquay/golang:1.22 AS build-env
1+
FROM quay.io/projectquay/golang:1.23 AS build-env
22
WORKDIR /go/src/app
33
COPY . .
44

bin/build-all

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,25 @@
77
# will fail due to an auth failure. Which means, you also need to be logged
88
# into that registry before you run it.
99

10-
cd $(dirname $0)/..
10+
set -euo pipefail
1111

12-
set -e
13-
for file in */build ; do (
12+
REPO_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
1413

15-
echo -e "\n### `dirname $file`\n"
16-
cd `dirname $file`
14+
find "${REPO_DIR}" -maxdepth 3 -type f -executable -name build | while read -r buildFile; do
15+
sampleDir="$(dirname "${buildFile}")"
16+
echo
17+
echo "### ${sampleDir}"
18+
if [ -f "${sampleDir}/.SKIP" ]; then
19+
echo "SKIPPING"
20+
continue
21+
fi
1722

18-
# Skip this dir
19-
[[ -e .SKIP ]] && echo "SKIPPING `dirname $file`" && continue
23+
pushd "${sampleDir}" >/dev/null
2024

21-
# Build the image(s)
2225
./build
2326

24-
) done
27+
popd >/dev/null
28+
done
2529

30+
echo
2631
echo "All done!"

cecli/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/projectquay/golang:1.22 AS build-env
1+
FROM quay.io/projectquay/golang:1.23 AS build-env
22
WORKDIR /go/src/app
33
COPY . .
44

configmaps-env/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/projectquay/golang:1.22 AS build-env
1+
FROM quay.io/projectquay/golang:1.23 AS build-env
22
WORKDIR /go/src/app
33
COPY config.go .
44

0 commit comments

Comments
 (0)