Skip to content

Commit

Permalink
fixes needed to get docker to compile
Browse files Browse the repository at this point in the history
  • Loading branch information
robkooper committed Dec 10, 2018
1 parent a15dd99 commit e697a0a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile.depends
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $(call depends,modules/emulator): | .install/base/logger
$(call depends,modules/meta.analysis): | .install/base/utils .install/base/db .install/base/logger .install/base/settings
$(call depends,modules/photosynthesis): | .install/base/logger
$(call depends,modules/priors): | .install/base/utils .install/base/logger
$(call depends,modules/rtm): | .install/base/logger .install/modules/assim.batch
$(call depends,modules/rtm): | .install/base/logger .install/modules/assim.batch .install/models/ed
$(call depends,modules/uncertainty): | .install/base/utils .install/modules/priors .install/base/db .install/modules/emulator .install/base/logger
$(call depends,models/biocro): | .install/base/logger .install/base/remote .install/base/utils .install/base/settings .install/modules/data.atmosphere .install/modules/data.land
$(call depends,models/template): | .install/base/logger .install/base/utils
Expand Down
4 changes: 4 additions & 0 deletions docker/base/Dockerfile.depends
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ RUN apt-get update \
librdf0-dev \
libnetcdf-dev \
libudunits2-dev \
libx11-dev \
libgl1-mesa-dev \
libglu1-mesa-dev \
libfreetype6-dev \
&& rm -rf /var/lib/apt/lists/*

# ----------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions models/biocro/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Suggests:
mockery (>= 0.3.0),
PEcAn.DB,
RPostgreSQL
# Remotes:
# github::ebimodeling/biocro
Remotes:
github::ebimodeling/biocro
License: FreeBSD + file LICENSE
Copyright: Energy Biosciences Institute, Authors
LazyLoad: yes
Expand Down
2 changes: 1 addition & 1 deletion release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if [ "${TAGS}" == "" ]; then
fi

# push pecan images
for i in depends base executor web data; do
for i in depends base executor web data thredds docs; do
for v in ${TAGS}; do
if [ "$v" != "latest" -o "$SERVER" != "" ]; then
${DEBUG} docker tag pecan/${i}:latest ${SERVER}pecan/${i}:${v}
Expand Down

0 comments on commit e697a0a

Please sign in to comment.