Skip to content

Commit

Permalink
Update UBI minio, add script-runner-api log_error
Browse files Browse the repository at this point in the history
  • Loading branch information
jmthomas committed Jan 27, 2025
1 parent 8990750 commit f8336de
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,14 @@ def sanitize_params(param_list, require_params: true, allow_forward_slash: false
end
return result
end

def log_error(e)
if ENV['OPENC3_FULL_BACKTRACE']
filtered_backtrace = e.backtrace
else
# Filter out backtrace to only application code
filtered_backtrace = e.backtrace.select { |line| !line.include?('activesupport') && !line.include?('actionpack') && !line.include?('rspec') && !line.include?('bundler') }
end
logger.error("#{e.message}\n#{filtered_backtrace.join("\n")}")
end
end
2 changes: 1 addition & 1 deletion openc3-minio/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG OPENC3_DEPENDENCY_REGISTRY=docker.io
# Consider updating openc3_build_ubi.sh when changing the release version
ARG OPENC3_MINIO_RELEASE=RELEASE.2025-01-18T00-31-37Z
ARG OPENC3_MINIO_RELEASE=RELEASE.2025-01-20T14-49-07Z
FROM ${OPENC3_DEPENDENCY_REGISTRY}/minio/minio:${OPENC3_MINIO_RELEASE}

COPY cacert.pem /devel/cacert.pem
Expand Down
4 changes: 2 additions & 2 deletions scripts/linux/openc3_build_ubi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ cd openc3-minio
docker build \
--network host \
--build-arg OPENC3_DEPENDENCY_REGISTRY=${OPENC3_UBI_REGISTRY}/ironbank/opensource \
--build-arg OPENC3_MINIO_RELEASE=RELEASE.2023-10-16T04-13-43Z \
--build-arg OPENC3_MINIO_RELEASE=RELEASE.2025-01-20T14-49-07Z \
--platform linux/amd64 \
-t "${OPENC3_REGISTRY}/${OPENC3_NAMESPACE}/openc3-minio-ubi:${OPENC3_TAG}" \
.
Expand Down Expand Up @@ -156,7 +156,7 @@ docker build \
--build-context docs=../docs.openc3.com \
--build-arg NPM_URL=$NPM_URL \
--build-arg OPENC3_DEPENDENCY_REGISTRY=${OPENC3_UBI_REGISTRY}/ironbank/opensource \
--build-arg OPENC3_MC_RELEASE=RELEASE.2023-10-14T01-57-03Z \
--build-arg OPENC3_MC_RELEASE=RELEASE.2025-01-17T23-25-50Z \
--build-arg OPENC3_BASE_IMAGE=openc3-base-ubi \
--build-arg OPENC3_NODE_IMAGE=openc3-node-ubi \
--build-arg OPENC3_REGISTRY=$OPENC3_REGISTRY \
Expand Down

0 comments on commit f8336de

Please sign in to comment.