Skip to content

Commit

Permalink
Merge pull request #10 from rnurgaliyev/updates
Browse files Browse the repository at this point in the history
Minor updates
  • Loading branch information
rnurgaliyev authored Feb 6, 2024
2 parents 493ec0d + 4fc54ec commit 03f7abc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM alpine:3.17
FROM alpine:3.19

RUN apk add --no-cache py3-pip openssl

RUN apk add --no-cache --virtual build-deps \
python3-dev openssl-dev libffi-dev musl-dev gcc rust cargo && \
pip install pykmip && \
pip install pykmip --break-system-packages && \
apk del build-deps

RUN mkdir -p /etc/pykmip \
Expand Down
8 changes: 4 additions & 4 deletions build-container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

set -e

if podman -v >/dev/null 2>&1; then
CM=podman
elif docker -v >/dev/null 2>&1; then
if docker -v >/dev/null 2>&1; then
CM=docker
elif podman -v >/dev/null 2>&1; then
CM=podman
else
echo "Container manager not installed. Please install podman or docker."
echo "Container manager not installed. Please install docker or podman."
exit 1
fi

Expand Down
9 changes: 4 additions & 5 deletions run-container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

set -e

if podman -v >/dev/null 2>&1; then
CM=podman
elif docker -v >/dev/null 2>&1; then
if docker -v >/dev/null 2>&1; then
CM=docker
elif podman -v >/dev/null 2>&1; then
CM=podman
else
echo "Container manager not installed. Please install podman or docker."
echo "Container manager not installed. Please install docker or podman."
exit 1
fi

Expand All @@ -21,7 +21,6 @@ fi

echo "=== Starting new container"
$CM run -d --name dsm-kmip-server -p 5696:5696 \
--restart=unless-stopped \
--mount type=bind,source="$WORKDIR"/state,target=/var/lib/state \
--mount type=bind,source="$WORKDIR"/certs,target=/var/lib/certs \
dsm-kmip-server:latest

0 comments on commit 03f7abc

Please sign in to comment.