Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update UBI minio, add script-runner-api log_error #1862

Merged
merged 3 commits into from
Jan 27, 2025
Merged

Update UBI minio, add script-runner-api log_error #1862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8336de
Update UBI minio, add script-runner-api log_error
jmthomas Jan 27, 2025
11ba997
Merge branch 'main' into minio
jmthomas Jan 27, 2025
e5f42c7
Fix bucket-explorer spec
jmthomas Jan 27, 2025
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
10 changes: 10 additions & 0 deletions openc3-cosmos-script-runner-api/app/controllers/application_controller.rb
View file
Open in desktop
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
View file
Open in desktop
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 playwright/tests/bucket-explorer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ test('navigate logs and tools bucket', async ({ page, utils }) => {
// Keep clicking alternatively on tools and then logs to force a refresh
// This allows the DEFAULT folder to appear in time
await expect(async () => {
await page.getByText('tools').click()
await page.getByText('logs').click()
await page.getByText('tools', { exact: true }).click()
await page.getByText('logs', { exact: true }).click()
await expect(page.getByRole('cell', { name: 'DEFAULT' })).toBeVisible()
}).toPass()
await expect(page).toHaveURL(/.*\/tools\/bucketexplorer\/logs%2F/)
Expand Down
4 changes: 2 additions & 2 deletions scripts/linux/openc3_build_ubi.sh
View file
Open in desktop
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
Loading