Merge pull request #158 from silinternational/release/5.0.0

Release 5.0.0 - Externally scheduled sync

Dockerfile

@@ -1,25 +1,10 @@
 FROM silintl/php8:8.1
 LABEL maintainer="[email protected]"
 
-ENV REFRESHED_AT 2020-06-10
-
-# Install cron
-RUN apt-get update \
-    && apt-get install -y \
-       cron \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+ENV REFRESHED_AT 2023-11-09
 
 RUN mkdir -p /data
 
-# Copy in cron configuration
-COPY dockerbuild/idsync-cron /etc/cron.d/idsync-cron
-RUN chmod 0644 /etc/cron.d/idsync-cron
-
-# get s3-expand
-RUN curl https://raw.githubusercontent.com/silinternational/s3-expand/1.5/s3-expand -o /usr/local/bin/s3-expand
-RUN chmod a+x /usr/local/bin/s3-expand
-
 WORKDIR /data
 
 # Install/cleanup composer dependencies
@@ -34,11 +19,4 @@ COPY application/ /data/
 RUN chown -R www-data:www-data \
     console/runtime/
 
-COPY dockerbuild/vhost.conf /etc/apache2/sites-enabled/
-
-# ErrorLog inside a VirtualHost block is ineffective for unknown reasons
-RUN sed -i -E 's@ErrorLog .*@ErrorLog /proc/self/fd/2@i' /etc/apache2/apache2.conf
-
-EXPOSE 80
-ENTRYPOINT ["/usr/local/bin/s3-expand"]
-CMD ["/data/run.sh"]
+CMD ["/data/yii", "batch/full"]

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 SIL International
+Copyright (c) 2017-2023 SIL International
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,7 +1,8 @@
-start: broker app
+sync_full: broker deps
+	docker-compose run --rm app
 
-app: deps
-	docker-compose up -d app
+sync_incremental: broker deps
+	docker-compose run --rm app bash -c "/data/yii batch/incremental"
 
 bash:
 	docker-compose run --rm cli bash
@@ -46,10 +47,10 @@ psr2:
 
 # NOTE: When running tests locally, make sure you don't exclude the integration
 #       tests (which we do when testing on Codeship).
-test: deps unittest app broker
+test: deps unittest broker
 	sleep 15 && make behat
 
-testci: deps app broker
+testci: deps broker
 	docker-compose run --rm cli bash -c "./run-tests.sh"
 
 unittest:

application/common/config/bootstrap.php

@@ -1,7 +1,6 @@
 <?php
 
 Yii::setAlias('common', dirname(__DIR__));
-Yii::setAlias('frontend', dirname(dirname(__DIR__)) . '/frontend');
 Yii::setAlias('backend', dirname(dirname(__DIR__)) . '/backend');
 Yii::setAlias('console', dirname(dirname(__DIR__)) . '/console');
 Yii::setAlias('@tests', dirname(dirname(__DIR__)) . '/tests');

application/common/config/main.php

@@ -131,7 +131,7 @@
                     'clientOptions' => [
                         'attach_stacktrace' => false, // stack trace identifies the logger call stack, not helpful
                         'environment' => YII_ENV,
-                        'release' => 'idp-id-sync@4.5.0',
+                        'release' => 'idp-id-sync@5.0.0',
                         'before_send' => function (Event $event) use ($idpName): ?Event {
                             $event->setExtra(['idp' => $idpName]);
                             return $event;