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

Upgrade ubuntu to 24.04 #1586

Merged
merged 1 commit into from
Jan 6, 2025
Merged

Upgrade ubuntu to 24.04 #1586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04 AS builder
FROM ubuntu:24.04 AS builder

ENV PYTHON_VERSION=3.12.2
ENV UV_VERSION=0.5.5
Expand All @@ -11,7 +11,8 @@ ENV UV_PROJECT_ENVIRONMENT="/home/apl/.venv"
RUN mkdir -p /app

# add apl user/group
RUN groupadd -g 1000 apl \
RUN userdel -r ubuntu \
&& groupadd -g 1000 apl \
&& useradd -g apl -s /bin/bash -u 1000 -p apl apl \
&& echo 'apl ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \
&& chown -R apl:apl /app \
Expand Down Expand Up @@ -60,13 +61,14 @@ RUN cd /app/ibet-Wallet-API \
&& rm -f /app/ibet-Wallet-API/uv.lock \
&& rm -rf /app/ibet-Wallet-API/tests/

FROM ubuntu:22.04 AS runner
FROM ubuntu:24.04 AS runner

# make application directory
RUN mkdir -p /app

# add apl user/group
RUN groupadd -g 1000 apl \
RUN userdel -r ubuntu \
&& groupadd -g 1000 apl \
&& useradd -g apl -s /bin/bash -u 1000 -p apl apl \
&& echo 'apl ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \
&& chown -R apl:apl /app \
Expand Down
10 changes: 6 additions & 4 deletions tests/Dockerfile_unittest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04 AS builder
FROM ubuntu:24.04 AS builder

ENV PYTHON_VERSION=3.12.2
ENV UV_VERSION=0.5.5
Expand All @@ -11,7 +11,8 @@ ENV UV_PROJECT_ENVIRONMENT="/home/apl/.venv"
RUN mkdir -p /app

# add apl user/group
RUN groupadd -g 1000 apl \
RUN userdel -r ubuntu \
&& groupadd -g 1000 apl \
&& useradd -g apl -s /bin/bash -u 1000 -p apl apl \
&& echo 'apl ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \
&& chown -R apl:apl /app \
Expand Down Expand Up @@ -57,13 +58,14 @@ RUN cd /app/ibet-Wallet-API \
&& uv venv $UV_PROJECT_ENVIRONMENT \
&& uv sync --frozen --no-install-project --extra ibet-explorer

FROM ubuntu:22.04 AS runner
FROM ubuntu:24.04 AS runner

# make application directory
RUN mkdir -p /app

# add apl user/group
RUN groupadd -g 1000 apl \
RUN userdel -r ubuntu \
&& groupadd -g 1000 apl \
&& useradd -g apl -s /bin/bash -u 1000 -p apl apl \
&& echo 'apl ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \
&& chown -R apl:apl /app \
Expand Down
Loading