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.

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

Bump dependencies #1219

Merged
merged 9 commits into from
May 2, 2024
Merged

Bump dependencies #1219

merged 9 commits into from
May 2, 2024

Conversation

jmthomas
Copy link
Member

@jmthomas jmthomas commented May 1, 2024

No description provided.

@jmthomas jmthomas requested a review from ryanmelt May 1, 2024 05:06
groupadd -r -g 1001 redis; \
useradd -r -g redis -u 1001 redis; \
apt update && apt upgrade -y; \
apk upgrade; \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only thing to do inside the update packages is to just apk upgrade.

# See https://github.com/docker-library/redis/blob/master/7.2/alpine/Dockerfile
RUN apk update && apk add shadow && \
usermod -u 1001 redis && \
groupmod -g 1001 redis
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I modify the default redis user and group to be ID 1001 to match existing

fi

RUN mkdir /config
COPY redis.conf /config/.
COPY redis_ephemeral.conf /config/.
COPY users.acl /config/.
COPY --chmod=0755 ./docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already part of the alpine docker image so I removed it (don't think it was being used anyway)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I modified the default one for a reason. Probably needs to be put back.

@@ -1,6 +1,6 @@
ARG OPENC3_DEPENDENCY_REGISTRY=docker.io
ARG TRAEFIK_CONFIG=traefik.yaml
FROM ${OPENC3_DEPENDENCY_REGISTRY}/traefik:v2.10.7
FROM ${OPENC3_DEPENDENCY_REGISTRY}/traefik:v2.11.2
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New traefik minor version (note v3 has just been released)

@@ -98,7 +98,7 @@ spec = Gem::Specification.new do |s|
# faraday includes faraday-net_http as the default adapter
s.add_runtime_dependency 'aws-sdk-s3', '< 2'
s.add_runtime_dependency 'cbor', '~> 0.5.9.6'
s.add_runtime_dependency 'childprocess', '~> 4.1'
s.add_runtime_dependency 'childprocess', '~> 5.0'
Copy link
Member Author

@jmthomas jmthomas May 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't seem like this was a breaking change. Changes were (https://github.com/enkessler/childprocess/releases/tag/v5.0.0):
Replace all backends by Process.spawn for portability, reliability and simplicity
Add support for Ruby 3.x

Copy link
Member Author

@jmthomas jmthomas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a run of 5.15.2, stop, then run of latest and everything seemed fine

fi

RUN mkdir /config
COPY redis.conf /config/.
COPY redis_ephemeral.conf /config/.
COPY users.acl /config/.
COPY --chmod=0755 ./docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I modified the default one for a reason. Probably needs to be put back.

@jmthomas
Copy link
Member Author

jmthomas commented May 1, 2024

Here's the docker file: https://github.com/docker-library/redis/blob/master/7.2/alpine/docker-entrypoint.sh

Looks like you deleted the section in the middle that allows the container to be started with --user. We're not doing that so what's the difference?

@ryanmelt
Copy link
Member

ryanmelt commented May 1, 2024

The gosu and --user stuff is bad because I do run containers with --user and whenever we use compose to a non-default user it does too.

That change needs to be put back.

Copy link

sonarcloud bot commented May 2, 2024

Quality Gate Passed Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@jmthomas jmthomas merged commit aec3bd2 into main May 2, 2024
17 checks passed
@jmthomas jmthomas deleted the dependencies branch May 2, 2024 02:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants