Skip to content

Commit

Permalink
Added comment to config file; advancing version number to 1.5.6.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Simpson committed Feb 13, 2020
1 parent e4f7887 commit 8f157fe
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
10 changes: 5 additions & 5 deletions DEPLOY.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ In a terminal window on my local workstation:
% ssh -i [path to saved key pair file] rancher@[hostname from EC2 dashboard]
$ sudo ros os version
v1.5.5
v1.5.6
$ exit
Expand Down Expand Up @@ -118,16 +118,16 @@ In a terminal window on my local workstation:
$ git clone https://github.com/ualibraries/patron-groups.git ual-patron-groups
$ cd ual-patron-groups
$ git checkout v1.5.5
$ git checkout v1.5.6
$ cd src/main/python
$ sudo pip3 install --trusted-host pypi.python.org -r requirements.txt
$ python3 setup.py sdist
$ cd ../../..
$ cd src/main/docker
$ cp ../python/dist/petal-1.5.5.tar.gz .
$ docker build -t pgrps:1.5.5 .
$ cp ../python/dist/petal-1.5.6.tar.gz .
$ docker build -t pgrps:1.5.6 .
$ cd ../../..

$ export LDAP_PASSWD=[ldap password]
Expand All @@ -136,4 +136,4 @@ In a terminal window on my local workstation:
$ docker run -e "LDAP_PASSWD=${LDAP_PASSWD}" \
-e "GROUPER_PASSWD=${GROUPER_PASSWD}" \
-e "SLACK_WEBHOOK=${SLACK_WEBHOOK}" \
--rm -d pgrps:1.5.5
--rm -d pgrps:1.5.6
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ prerequisites, and then build a source distribution of the module:
% python setup.py sdist

% ls dist
petal-1.5.5.tar.gz
petal-1.5.6.tar.gz
% cd ../../..

Expand All @@ -107,12 +107,12 @@ Change to the Docker source directory, copy the distribution file over
from the Python side, and build the Docker container image:

% cd src/main/docker
% cp ../python/dist/petal-1.5.5.tar.gz .
% docker build -t pgrps:1.5.5 .
% cp ../python/dist/petal-1.5.6.tar.gz .
% docker build -t pgrps:1.5.6 .

% docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
pgrps 1.5.5 16cfafa9d0f1 12 seconds ago 80.1MB
pgrps 1.5.6 16cfafa9d0f1 12 seconds ago 80.1MB
% cd ../../..

Expand All @@ -138,7 +138,7 @@ hand, instantiate using an interactive shell:
% docker run -e "LDAP_PASSWD=${LDAP_PASSWD}" \
-e "GROUPER_PASSWD=${GROUPER_PASSWD}" \
-e "SLACK_WEBHOOK=${SLACK_WEBHOOK}" \
--rm -it pgrps:1.5.5 /bin/bash
--rm -it pgrps:1.5.6 /bin/bash

# which petl
/usr/bin/petl
Expand All @@ -161,7 +161,7 @@ in the background:
% docker run -e "LDAP_PASSWD=${LDAP_PASSWD}" \
-e "GROUPER_PASSWD=${GROUPER_PASSWD}" \
-e "SLACK_WEBHOOK=${SLACK_WEBHOOK}" \
--rm -d pgrps:1.5.5
--rm -d pgrps:1.5.6

The log output from the "run_petl" invocation should once again wind
up in the Slack channel associated with the "SLACK_WEBHOOK"
Expand Down
6 changes: 3 additions & 3 deletions src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV PACKAGES="dumb-init bash python3 python3-dev ca-certificates tzdata" \
GROUPER_PASSWD="***supply at runtime***" \
SLACK_WEBHOOK="***supply at runtime***"

ADD petal-1.5.5.tar.gz /var/tmp
ADD petal-1.5.6.tar.gz /var/tmp
ADD run_petl /etc/periodic/daily

RUN echo \
Expand All @@ -27,8 +27,8 @@ RUN echo \
&& echo "US/Arizona" > /etc/timezone \
#
# install petal
&& pip install --trusted-host pypi.python.org -r /var/tmp/petal-1.5.5/requirements.txt \
&& pip install /var/tmp/petal-1.5.5
&& pip install --trusted-host pypi.python.org -r /var/tmp/petal-1.5.6/requirements.txt \
&& pip install /var/tmp/petal-1.5.6

ENTRYPOINT [ "/usr/bin/dumb-init", "--" ]
CMD [ "/usr/sbin/crond", "-f" ]
3 changes: 3 additions & 0 deletions src/main/python/config/petl.ini
Original file line number Diff line number Diff line change
Expand Up @@ -444,3 +444,6 @@ ldap_query =
grouper_group = ual-law-base
batch_size = 1000
batch_timeout = 900

# EOF

2 changes: 1 addition & 1 deletion src/main/python/src/petal/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '1.5.5'
__version__ = '1.5.6'

from .ldap_query import LDAPQuery
from .grouper_query import GrouperQuery
Expand Down

0 comments on commit 8f157fe

Please sign in to comment.