This is an automated email from the ASF dual-hosted git repository.
rkk pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/sdap-ingester.git
The following commit(s) were added to refs/heads/develop by this push:
new abb0ab0 Fixed install of kubectl in Collection Manager image build
(#99)
abb0ab0 is described below
commit abb0ab0228a2d13723c7460f7cb61a782ece241e
Author: Riley Kuttruff <[email protected]>
AuthorDate: Mon May 13 08:10:23 2024 -0700
Fixed install of kubectl in Collection Manager image build (#99)
* Fixed install of kubectl in Collection Manager image build
* Changelog update
* Changelog update
---------
Co-authored-by: rileykk <[email protected]>
---
CHANGELOG.md | 3 ++-
collection_manager/docker/Dockerfile | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c537e0f..e2d6486 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,8 @@ and this project adheres to [Semantic
Versioning](https://semver.org/spec/v2.0.0
### Removed
### Fixed
- SDAP-512: Fixed Granule Ingester not closing connections to
Zookeeper/Solr/Cassandra, eventually exhausting network resources and requiring
a restart
-- SDAP-502: Fix for rare bug where gridded tiles generated from inputs where
there is a dimension length where `dimensionLength mod tileSliceLength == 1`
would cause tile generation to fail. This is because `np.squeeze` is used on
the coordinate arrays, which, if the generated tile has only a single lat or
lon, would squeeze the corresponding coordinate into a dimensionless array,
which would raise an error down the line when `len` was called with it. Added a
check for this case that bot [...]
+- SDAP-502: Fix for rare bug where gridded tiles generated from inputs where
there is a dimension length where `dimensionLength mod tileSliceLength == 1`
would cause tile generation to fail. This is because `np.squeeze` is used on
the coordinate arrays, which, if the generated tile has only a single lat or
lon, would squeeze the corresponding coordinate into a dimensionless array,
which would raise an error down the line when `len` was called with it. Added a
check for this case that bot [...]
+- Fixed install of `kubectl` in Collection Manager image build
### Security
## [1.2.0] - 2023-11-22
diff --git a/collection_manager/docker/Dockerfile
b/collection_manager/docker/Dockerfile
index 5c48215..993ce58 100644
--- a/collection_manager/docker/Dockerfile
+++ b/collection_manager/docker/Dockerfile
@@ -15,9 +15,9 @@
FROM python:3.8.13
-RUN apt-get update && apt-get install -y apt-transport-https gnupg2
-RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key
add -
-RUN echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a
/etc/apt/sources.list.d/kubernetes.list
+RUN apt-get update && apt-get install -y apt-transport-https gnupg2
ca-certificates curl
+RUN mkdir -p -m 755 /etc/apt/keyrings && curl -fsSL
https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | gpg --dearmor -o
/etc/apt/keyrings/kubernetes-apt-keyring.gpg
+RUN echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg]
https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /' | tee
/etc/apt/sources.list.d/kubernetes.list
RUN apt-get update && apt-get install -y kubectl
COPY VERSION.txt /VERSION.txt
