Skip to content

Commit

Permalink
Revert "keycloak: temporarily disable build until issues are solved"
Browse files Browse the repository at this point in the history
This reverts commit 24a49a0.

Re-enables keycloak builds with new fixes in place.
  • Loading branch information
spoore1 committed Aug 4, 2023
1 parent ba4d3c6 commit e6ecb30
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function cleanup {
}

function compose {
docker-compose -f "../docker-compose.yml" -f "./docker-compose.build.yml" $@
docker-compose -f "../docker-compose.yml" -f "../docker-compose.keycloak.yml" -f "./docker-compose.build.yml" $@
}

function base_exec {
Expand Down Expand Up @@ -125,20 +125,20 @@ if [ "$SKIP_BASE" == 'no' ]; then
build_base_image "ci-base-ldap:${TAG}" base-ipa
build_base_image "ci-base-ground:${TAG}" base-nfs
build_base_image "ci-base-ground:${TAG}" base-kdc
#build_base_image "ci-base-ground:${TAG}" base-keycloak
build_base_image "ci-base-ground:${TAG}" base-keycloak
fi

# Create services
compose up --detach
ansible-playbook --limit "!master.keycloak.test" $ANSIBLE_OPTS ./ansible/playbook_image_service.yml
ansible-playbook $ANSIBLE_OPTS ./ansible/playbook_image_service.yml
compose stop
build_service_image sssd-wip-client client
build_service_image sssd-wip-ipa ipa
build_service_image sssd-wip-ldap ldap
build_service_image sssd-wip-samba samba
build_service_image sssd-wip-nfs nfs
build_service_image sssd-wip-kdc kdc
#build_service_image sssd-wip-keycloak keycloak
build_service_image sssd-wip-keycloak keycloak
compose down

# Create development images with additional packages
Expand Down
3 changes: 3 additions & 0 deletions src/docker-compose.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ services:
kdc:
image: localhost/sssd/ci-base-kdc:${TAG}
container_name: sssd-wip-kdc
keycloak:
image: localhost/sssd/ci-base-keycloak:${TAG}
container_name: sssd-wip-keycloak
4 changes: 2 additions & 2 deletions src/push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ push ci-base-ldap "$TAG" "$EXTRA_TAGS"
push ci-base-samba "$TAG" "$EXTRA_TAGS"
push ci-base-nfs "$TAG" "$EXTRA_TAGS"
push ci-base-kdc "$TAG" "$EXTRA_TAGS"
#push ci-base-keycloak "$TAG" "$EXTRA_TAGS"
push ci-base-keycloak "$TAG" "$EXTRA_TAGS"

# Push service images
push ci-dns latest ""
Expand All @@ -70,4 +70,4 @@ push ci-ldap "$TAG" "$EXTRA_TAGS"
push ci-samba "$TAG" "$EXTRA_TAGS"
push ci-nfs "$TAG" "$EXTRA_TAGS"
push ci-kdc "$TAG" "$EXTRA_TAGS"
#push ci-keycloak "$TAG" "$EXTRA_TAGS"
push ci-keycloak "$TAG" "$EXTRA_TAGS"

0 comments on commit e6ecb30

Please sign in to comment.