Skip to content

Commit

Permalink
Merge pull request #199 from shieldproject/update-for-887
Browse files Browse the repository at this point in the history
Update for Shield v8.8.7
  • Loading branch information
krutten authored Jul 23, 2024
2 parents 05b2c02 + 4444c50 commit cc8b15b
Show file tree
Hide file tree
Showing 14 changed files with 113 additions and 27 deletions.
4 changes: 4 additions & 0 deletions .final_builds/packages/nginx/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ builds:
version: 3e69a75504769646a78bc7464722f10c73489129
blobstore_id: 8a428eeb-b94b-482c-a37e-7378510ff53e
sha1: a4b06094253406d7a91f15ecf4164298251cf7f4
85409c2a258e188bab29c8dc304cc33ce7906520224c215759997a697cdd3862:
version: 85409c2a258e188bab29c8dc304cc33ce7906520224c215759997a697cdd3862
blobstore_id: eb2eca29-e058-49cf-7e04-e37dcf932d7b
sha1: sha256:0d725d436ea4523335f79ad56ac21fc9a3af5ab407c836621dbe8d41c62c00b0
a6663157317884afd006f33abe1fad29a88b42c42b617a4de2bbdbb702104c2d:
version: a6663157317884afd006f33abe1fad29a88b42c42b617a4de2bbdbb702104c2d
blobstore_id: a661f7f8-3ccc-4cf7-6ce2-25a6038f41cd
Expand Down
4 changes: 4 additions & 0 deletions .final_builds/packages/shield/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ builds:
version: 79776a1fe2888eae0a5829b2e1047986ee6981a4
blobstore_id: 9858ec7f-3b9c-462f-a712-63aa4599cbf2
sha1: 233cdbeea351e0c2df4272b03f2f46d1f9963a04
7bc76673002b995f05c42b539a23dfdab9dc9dcd56f1b942e1973b4a7851e047:
version: 7bc76673002b995f05c42b539a23dfdab9dc9dcd56f1b942e1973b4a7851e047
blobstore_id: 4f77769c-cd6e-431a-4663-e210e9fe0ec4
sha1: sha256:cecd613085d2993bb0ee20bcf3840a425670d1fc78bdb3d52249d9b643f04121
8267c9ec1283f487dd6ac6dbbd9c6179c0e649d4:
version: 8267c9ec1283f487dd6ac6dbbd9c6179c0e649d4
blobstore_id: 03d63e08-5a9f-4c68-a322-5f749e997998
Expand Down
4 changes: 4 additions & 0 deletions .final_builds/packages/sqlite3/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ builds:
version: 4795e82443c43c05b1c7f4b4f3e21d6fa09e18b6b8a4308e6b679d4f095a1ff3
blobstore_id: 0b6f1c45-9330-4411-7e52-da7d89ba7aac
sha1: sha256:64df4ce417c6447f16e38f7b9ec7ff9eccf885337a2f8b6da0233887bd42889c
8eb9b961d607720bbaa7c84891f392cc236d2670fdb6e0ea9b98bac094ed9c86:
version: 8eb9b961d607720bbaa7c84891f392cc236d2670fdb6e0ea9b98bac094ed9c86
blobstore_id: c436d718-7eb2-404c-6f4b-9119d74f981d
sha1: sha256:572dfc6f2a606af5d047672750e6e54f2170c3cc618927e00a81bd0d4c9903f8
ac2eea8784d5072b38d89a2400b5e93095f2dcbb6b4f1de6aee848e8b93fa7e1:
version: ac2eea8784d5072b38d89a2400b5e93095f2dcbb6b4f1de6aee848e8b93fa7e1
blobstore_id: 2420e07b-1cd3-4e43-7ed4-f8dce397372c
Expand Down
4 changes: 4 additions & 0 deletions .final_builds/packages/vault/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ builds:
version: 6e242f04f2355d30b5f9e762509215dfa714ae6e15a1c28e35e2ec051dda468f
blobstore_id: df0f5f00-70a7-484f-7c3d-2a902343914c
sha1: sha256:d74d4476be21936d282b5b2e21c8632e1aa9815b285f6a488e68530a11d8aded
d8be7860e547b5bf21e0a14b8ea2be84a5ae199f02411a2d1a2fea22c3918a13:
version: d8be7860e547b5bf21e0a14b8ea2be84a5ae199f02411a2d1a2fea22c3918a13
blobstore_id: 24ab960a-9bd9-4f18-5984-424f37b166e0
sha1: sha256:6cd2a9d63f8c2c973ac43bf0002a0c2a9a49abc95b9474ecef8213e3da2d32bf
dadee0054e221dc0af72486cca6cd755e38036212d238a604c957235358b12ca:
version: dadee0054e221dc0af72486cca6cd755e38036212d238a604c957235358b12ca
blobstore_id: 86d7e997-e69c-445c-761c-57c313c96c92
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ Tracker][github].
[slack-join]: https://shieldproject.io/community#slack
[home]: https://shieldproject.io
[docs]: https://shieldproject.io/docs/latest/ops/
[github]: https://github.com/starkandwayne/shield/issues
[github]: https://github.com/shieldproject/shield/issues

[mysql-addon]: https://github.com/shieldproject/shield-addon-mysql-boshrelease
[postgres-addon]: https://github.com/shieldproject/shield-addon-postgres-boshrelease
Expand Down
35 changes: 20 additions & 15 deletions config/blobs.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
nginx/nginx-1.25.1.tar.gz:
size: 1213919
sha: sha256:f09071ac46e0ea3adc0008ef0baca229fc6b4be4533baef9bbbfba7de29a8602
nginx/pcre2-10.42.tar.gz:
size: 2397194
sha: sha256:c33b418e3b936ee3153de2c61cc638e7e4fe3156022a5c77d0711bcbb9d64f1f
shield/shield-server-linux-amd64-8.8.6.tar.gz:
size: 132510067
sha: sha256:22ba978bc23caa5429a55c5d4f61c2f85797d48ae948e598a54988b41ca19080
sqlite3/sqlite-autoconf-3420000.tar.gz:
size: 3148813
sha: sha256:7abcfd161c6e2742ca5c6c0895d1f853c940f203304a0b49da4e1eca5d088ca6
vault/vault_1.14.0_linux_amd64.zip:
size: 98051558
sha: sha256:3d5c27e35d8ed43d861e892fc7d8f888f2fda4319a36f344f8c09603fb184b50
nginx/nginx-1.26.1.tar.gz:
size: 1244738
object_id: 964ac3a9-c1d7-42e6-79e2-b64e5cce2fb5
sha: sha256:f9187468ff2eb159260bfd53867c25ff8e334726237acf227b9e870e53d3e36b
nginx/pcre2-10.44.tar.gz:
size: 2552792
object_id: 92e967c3-b43d-42f8-6154-9cbc3cb18c37
sha: sha256:86b9cb0aa3bcb7994faa88018292bc704cdbb708e785f7c74352ff6ea7d3175b
shield/shield-server-linux-amd64.tar.gz:
size: 134229674
object_id: e42fd5bd-fd9d-4e2c-645f-d43e428a6c14
sha: sha256:48fd1d2fa2a67eb1c955ad3b83c35bf0d1f47d6b9edccba9b4988c0d719b38f3
sqlite3/sqlite-autoconf-3460000.tar.gz:
size: 3265248
object_id: 1af3de5f-1631-49a5-490d-67249c4cfadf
sha: sha256:6f8e6a7b335273748816f9b3b62bbdc372a889de8782d7f048c653a447417a7d
vault/vault_1.17.2_linux_amd64.zip:
size: 148550274
object_id: 01d33401-93a4-4258-4199-a9c4f17e5c6b
sha: sha256:a0c0449e640c8be5dcf7b7b093d5884f6a85406dbb86bbad0ea06becad5aaab8
8 changes: 4 additions & 4 deletions packages/nginx/packaging
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
set -eux
CPUS=$(grep -c ^processor /proc/cpuinfo)

tar -xzf "nginx/pcre2-10.42.tar.gz"
tar -xzf "nginx/nginx-1.25.1.tar.gz"
pushd nginx-1.25.1
tar -xzf "nginx/pcre2-10.44.tar.gz"
tar -xzf "nginx/nginx-1.26.1.tar.gz"
pushd nginx-1.26.1
./configure \
--prefix=${BOSH_INSTALL_TARGET} \
--with-pcre=../pcre2-10.42 \
--with-pcre=../pcre2-10.44 \
--with-http_stub_status_module \
--with-http_ssl_module \
--with-http_dav_module
Expand Down
4 changes: 2 additions & 2 deletions packages/nginx/spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: nginx
files:
- nginx/nginx-1.25.1.tar.gz
- nginx/pcre2-10.42.tar.gz
- nginx/nginx-1.26.1.tar.gz
- nginx/pcre2-10.44.tar.gz
4 changes: 2 additions & 2 deletions packages/sqlite3/packaging
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
set -eux
CPUS=$(grep -c ^processor /proc/cpuinfo)

tar -xzvf sqlite3/sqlite-autoconf-3420000.tar.gz
pushd sqlite-autoconf-3420000
tar -xzvf sqlite3/sqlite-autoconf-3460000.tar.gz
pushd sqlite-autoconf-3460000
./configure --prefix ${BOSH_INSTALL_TARGET}
make -j$CPUS
make install
Expand Down
2 changes: 1 addition & 1 deletion packages/sqlite3/spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
name: sqlite3
files:
- sqlite3/sqlite-autoconf-3420000.tar.gz
- sqlite3/sqlite-autoconf-3460000.tar.gz
2 changes: 1 addition & 1 deletion packages/vault/packaging
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ set -eux
mkdir $BOSH_INSTALL_TARGET/bin

pushd vault
unzip vault_1.14.0_linux_amd64.zip
unzip vault_1.17.2_linux_amd64.zip
cp -a vault $BOSH_INSTALL_TARGET/bin
popd
2 changes: 1 addition & 1 deletion packages/vault/spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
name: vault
files:
- vault/vault_1.14.0_linux_amd64.zip
- vault/vault_1.17.2_linux_amd64.zip
2 changes: 2 additions & 0 deletions releases/shield/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ builds:
version: 6.4.1
73299965-64f5-4a91-70d6-b18336935553:
version: 8.6.2
78206d78-2cf1-4ba0-5b49-4abd86a7059f:
version: 9.2.0
78684417-efc9-4cbd-bcd8-415b3426e2a1:
version: 6.6.3
79939deb-af49-4263-ac8b-22fe1590a044:
Expand Down
63 changes: 63 additions & 0 deletions releases/shield/shield-9.2.0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: shield
version: 9.2.0
commit_hash: fa9f9cd
uncommitted_changes: false
jobs:
- name: core
version: fd087092acf448cd06bdf0d08a5a8f98b7a24487192e99a061791ee2a088891d
fingerprint: fd087092acf448cd06bdf0d08a5a8f98b7a24487192e99a061791ee2a088891d
sha1: sha256:f145686f433cfa195c7dd04b1f5512ede52d82760488f3d1f792eb9645b2b986
packages:
- shield
- sqlite3
- nginx
- vault
- name: deprovision
version: 36cd5a99dd1878e15fd68b630ed26b058609351b8a870b3f509c6a8dead377a7
fingerprint: 36cd5a99dd1878e15fd68b630ed26b058609351b8a870b3f509c6a8dead377a7
sha1: sha256:b7f704a64fa42de83d405c1ba98e8d308d3e1ef227db8c147272fa9c8450a494
packages:
- shield
- name: import
version: 100aedaf570ffd800157889ba5efac25b15ffd3574af4ba2fb20aad3fbe8a9fe
fingerprint: 100aedaf570ffd800157889ba5efac25b15ffd3574af4ba2fb20aad3fbe8a9fe
sha1: sha256:f5382c738b82bee0fe839182d66eb37ff5aaa17efe10fddbd812a009d095f6d7
packages:
- shield
- name: shield-agent
version: 3b85111ffe8320c05002717aa39d2997774e6245d465a3ca08c83581a19b5405
fingerprint: 3b85111ffe8320c05002717aa39d2997774e6245d465a3ca08c83581a19b5405
sha1: sha256:c51f0e40319b9ceb0c2b56b71f99a7bb4378ea06577d1a3217344a48173f2f39
packages:
- shield
- name: store
version: e03d06eadb963017022a6988bcd38a52ca6adde51b9e16f7758b95e0256f6065
fingerprint: e03d06eadb963017022a6988bcd38a52ca6adde51b9e16f7758b95e0256f6065
sha1: sha256:51978b0f735d40ca6b329d3ef3c393dba607c026dd15fa127b5c2103b1ea82b8
packages:
- nginx
packages:
- name: nginx
version: 85409c2a258e188bab29c8dc304cc33ce7906520224c215759997a697cdd3862
fingerprint: 85409c2a258e188bab29c8dc304cc33ce7906520224c215759997a697cdd3862
sha1: sha256:0d725d436ea4523335f79ad56ac21fc9a3af5ab407c836621dbe8d41c62c00b0
dependencies: []
- name: shield
version: 7bc76673002b995f05c42b539a23dfdab9dc9dcd56f1b942e1973b4a7851e047
fingerprint: 7bc76673002b995f05c42b539a23dfdab9dc9dcd56f1b942e1973b4a7851e047
sha1: sha256:cecd613085d2993bb0ee20bcf3840a425670d1fc78bdb3d52249d9b643f04121
dependencies: []
- name: sqlite3
version: 8eb9b961d607720bbaa7c84891f392cc236d2670fdb6e0ea9b98bac094ed9c86
fingerprint: 8eb9b961d607720bbaa7c84891f392cc236d2670fdb6e0ea9b98bac094ed9c86
sha1: sha256:572dfc6f2a606af5d047672750e6e54f2170c3cc618927e00a81bd0d4c9903f8
dependencies: []
- name: vault
version: d8be7860e547b5bf21e0a14b8ea2be84a5ae199f02411a2d1a2fea22c3918a13
fingerprint: d8be7860e547b5bf21e0a14b8ea2be84a5ae199f02411a2d1a2fea22c3918a13
sha1: sha256:6cd2a9d63f8c2c973ac43bf0002a0c2a9a49abc95b9474ecef8213e3da2d32bf
dependencies: []
license:
version: bbb5d860163ee53d5e97eadd99fecce8fcaabc50d2c1b81e9459aff6086e620a
fingerprint: bbb5d860163ee53d5e97eadd99fecce8fcaabc50d2c1b81e9459aff6086e620a
sha1: sha256:9546d6479d40c970fd701f8197a99fb088cd8c7cbaa280370fa99957e1659779

0 comments on commit cc8b15b

Please sign in to comment.