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

Modifying Registry to use github container registry instead of docker #254

Merged
merged 5 commits into from
Sep 15, 2023
Merged

Modifying Registry to use github container registry instead of docker #254

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dad63e8
Modifying Registry to use github container registry instead of docker…
srprasanna Sep 15, 2023
a227865
Modifying Registry to use github container registry instead of docker…
srprasanna Sep 15, 2023
d1ffec1
Merge branch 'main' into 807-move-ghcr
srprasanna Sep 15, 2023
72064f8
modify file permissions
dileepbapat Dec 9, 2021
70460c2
modify file permissions
srprasanna Sep 15, 2023
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: 4 additions & 4 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ node {
}

stage('Build image') {
app = docker.build("dockerhub/sunbird-rc-core","target")
claimApp = docker.build("dockerhub/sunbird-rc-claim-ms","java/claim")
app = docker.build("ghcr.io/sunbird-rc/sunbird-rc-core","target")
claimApp = docker.build("ghcr.io/sunbird-rc/sunbird-rc-claim-ms","java/claim")
}

// stage('Test image') {
Expand All @@ -39,8 +39,8 @@ node {

// stage('Deploy image') {
// sh "ssh kesavan@10.4.0.6 'kubectl get pods -n ndear'"
// sh "ssh kesavan@10.4.0.6 'kubectl set image deployment/registry registry=dockerhub/sunbird-rc:${env.BUILD_NUMBER} --record --namespace=ndear'"
// sh "ssh kesavan@10.4.0.6 'kubectl set image deployment/claim-ms claim-ms=dockerhub/sunbird-rc-claim-ms:${env.BUILD_NUMBER} --record --namespace=ndear'"
// sh "ssh kesavan@10.4.0.6 'kubectl set image deployment/registry registry=ghcr.io/sunbird-rc/sunbird-rc:${env.BUILD_NUMBER} --record --namespace=ndear'"
// sh "ssh kesavan@10.4.0.6 'kubectl set image deployment/claim-ms claim-ms=ghcr.io/sunbird-rc/sunbird-rc-claim-ms:${env.BUILD_NUMBER} --record --namespace=ndear'"
// }

}
Expand Down
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
SOURCES := $(call rwildcard,java/,*.java)
RELEASE_VERSION = v0.0.14
IMAGES := dockerhub/sunbird-rc-core dockerhub/sunbird-rc-nginx dockerhub/sunbird-rc-context-proxy-service \
dockerhub/sunbird-rc-public-key-service dockerhub/sunbird-rc-keycloak dockerhub/sunbird-rc-certificate-api \
dockerhub/sunbird-rc-certificate-signer dockerhub/sunbird-rc-notification-service dockerhub/sunbird-rc-claim-ms \
dockerhub/sunbird-rc-digilocker-certificate-api dockerhub/sunbird-rc-bulk-issuance dockerhub/sunbird-rc-metrics
IMAGES := ghcr.io/sunbird-rc/sunbird-rc-core ghcr.io/sunbird-rc/sunbird-rc-nginx ghcr.io/sunbird-rc/sunbird-rc-context-proxy-service \
ghcr.io/sunbird-rc/sunbird-rc-public-key-service ghcr.io/sunbird-rc/sunbird-rc-keycloak ghcr.io/sunbird-rc/sunbird-rc-certificate-api \
ghcr.io/sunbird-rc/sunbird-rc-certificate-signer ghcr.io/sunbird-rc/sunbird-rc-notification-service ghcr.io/sunbird-rc/sunbird-rc-claim-ms \
ghcr.io/sunbird-rc/sunbird-rc-digilocker-certificate-api ghcr.io/sunbird-rc/sunbird-rc-bulk-issuance ghcr.io/sunbird-rc/sunbird-rc-metrics
build: java/registry/target/registry.jar
echo ${SOURCES}
rm -rf java/claim/target/*.jar
cd target && rm -rf * && jar xvf ../java/registry/target/registry.jar && cp ../java/Dockerfile ./ && docker build -t dockerhub/sunbird-rc-core .
cd target && rm -rf * && jar xvf ../java/registry/target/registry.jar && cp ../java/Dockerfile ./ && docker build -t ghcr.io/sunbird-rc/sunbird-rc-core .
make -C java/claim
make -C services/certificate-api docker
make -C services/certificate-signer docker
Expand All @@ -20,7 +20,7 @@ build: java/registry/target/registry.jar
make -C services/metrics docker
make -C services/digilocker-certificate-api docker
make -C services/bulk_issuance docker
docker build -t dockerhub/sunbird-rc-nginx .
docker build -t ghcr.io/sunbird-rc/sunbird-rc-nginx .

java/registry/target/registry.jar: $(SOURCES)
echo $(SOURCES)
Expand Down
Empty file modified build.sh
100755 → 100644
View file
Open in desktop
srprasanna marked this conversation as resolved.
Show resolved Hide resolved
Empty file.
Empty file modified configure-dependencies.sh
100755 → 100644
View file
Open in desktop
srprasanna marked this conversation as resolved.
Show resolved Hide resolved
Empty file.
Empty file modified deps/keycloak-mobile-number-login-spi/build.sh
100755 → 100644
View file
Open in desktop
srprasanna marked this conversation as resolved.
Show resolved Hide resolved
Empty file.
Empty file modified deps/keycloak-mobile-number-login-spi/mvnw
100755 → 100644
View file
Open in desktop
srprasanna marked this conversation as resolved.
Show resolved Hide resolved
Empty file.
Empty file modified ...spi/src/main/resources/META-INF/services/org.keycloak.authentication.AuthenticatorFactory
100755 → 100644
View file
Open in desktop
srprasanna marked this conversation as resolved.
Show resolved Hide resolved
Empty file.
4 changes: 2 additions & 2 deletions deps/keycloak/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
build:
echo "Building docker image"
@cd ../keycloak-mobile-number-login-spi/ && sh ./build.sh
@docker build -t dockerhub/sunbird-rc-keycloak .
@docker build -t ghcr.io/sunbird-rc/sunbird-rc-keycloak .

push:
@docker push dockerhub/sunbird-rc-keycloak
@docker push ghcr.io/sunbird-rc/sunbird-rc-keycloak
2 changes: 1 addition & 1 deletion deps/keycloak/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- POSTGRES_USER=keycloak
- POSTGRES_PASSWORD=keycloak
keycloak:
image: dockerhub/keycloak
image: ghcr.io/sunbird-rc/keycloak
# build:
# .
environment:
Expand Down
Loading
Loading