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

Iss1888 - Reference images in GHCR "docker proxy" instead of Harbor & fix broken adduser/addgroup for 'galasa' #337

Merged
merged 2 commits into from
Feb 13, 2025
Merged

Iss1888 - Reference images in GHCR "docker proxy" instead of Harbor & fix broken adduser/addgroup for 'galasa' #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf37702
Fix incorrect addgroup and adduser inside CLI docker image
jadecarino Feb 11, 2025
caf54cf
Replace use of images in Harbor with GHCR
jadecarino Feb 12, 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
8 changes: 5 additions & 3 deletions dockerfiles/dockerfile.galasactl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
FROM harbor.galasa.dev/docker_proxy_cache/library/ubuntu:20.04
FROM ghcr.io/galasa-dev/ubuntu:20.04

RUN apt-get update \
&& apt-get install -y ca-certificates

ARG platform

RUN addgroup galasa && \
adduser -D -G galasa -h /galasa -s /bin/sh galasa
RUN groupadd -r galasa && \
useradd -r -g galasa -d /galasa -s /bin/bash galasa && \
mkdir -p /galasa && \
chown galasa:galasa /galasa

COPY bin/galasactl-${platform} /bin/galasactl
RUN chmod +x /bin/galasactl
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/dockerfile.galasactl-executables
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM harbor.galasa.dev/docker_proxy_cache/library/httpd:alpine
FROM ghcr.io/galasa-dev/httpd:alpine

RUN rm -v /usr/local/apache2/htdocs/*
COPY dockerfiles/httpdconf/base-httpd.conf /usr/local/apache2/conf/httpd.conf
Expand Down