Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.2.57

- Fixed Dockerfile to set `GOROOT` to `/usr/lib/go` when using system Go (`GO_VERSION=system`) instead of always using `/usr/local/go`.

## 2.2.56

- Removed process timeout from reachability analysis subprocess. Timeouts are now only passed to the Coana CLI via the `--analysis-timeout` flag.
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ RUN apk update && apk add --no-cache \

# Install Go with version control
RUN if [ "$GO_VERSION" = "system" ]; then \
apk add --no-cache go; \
apk add --no-cache go && \
echo "/usr/lib/go" > /etc/goroot; \
else \
cd /tmp && \
ARCH=$(uname -m) && \
Expand All @@ -31,7 +32,8 @@ RUN if [ "$GO_VERSION" = "system" ]; then \
esac && \
wget https://golang.org/dl/go${GO_VERSION}.linux-${GOARCH}.tar.gz && \
tar -C /usr/local -xzf go${GO_VERSION}.linux-${GOARCH}.tar.gz && \
rm go${GO_VERSION}.linux-${GOARCH}.tar.gz; \
rm go${GO_VERSION}.linux-${GOARCH}.tar.gz && \
echo "/usr/local/go" > /etc/goroot; \
fi

# Install Java with version control
Expand Down Expand Up @@ -64,8 +66,7 @@ RUN npm install @coana-tech/cli socket -g && \
rustup component add rustfmt clippy

# Set environment paths
ENV PATH="/usr/local/go/bin:/root/.cargo/bin:${PATH}"
ENV GOROOT="/usr/local/go"
ENV PATH="/usr/local/go/bin:/usr/lib/go/bin:/root/.cargo/bin:${PATH}"
ENV GOPATH="/go"

# Install uv
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "hatchling.build"

[project]
name = "socketsecurity"
version = "2.2.56"
version = "2.2.57"
requires-python = ">= 3.10"
license = {"file" = "LICENSE"}
dependencies = [
Expand Down
3 changes: 3 additions & 0 deletions scripts/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
# docker run socketdev/cli socketcli --params
# docker run socketdev/cli --cli-params

# Set GOROOT from the value determined at build time
export GOROOT=$(cat /etc/goroot)

# Check if we have any arguments
if [ $# -eq 0 ]; then
# No arguments provided, run socketcli with no args (will show help)
Expand Down
2 changes: 1 addition & 1 deletion socketsecurity/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__author__ = 'socket.dev'
__version__ = '2.2.56'
__version__ = '2.2.57'
USER_AGENT = f'SocketPythonCLI/{__version__}'
Loading