Skip to content

Commit e697a0a

Browse files
committed
fixes needed to get docker to compile
1 parent a15dd99 commit e697a0a

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

Makefile.depends

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ $(call depends,modules/emulator): | .install/base/logger
2121
$(call depends,modules/meta.analysis): | .install/base/utils .install/base/db .install/base/logger .install/base/settings
2222
$(call depends,modules/photosynthesis): | .install/base/logger
2323
$(call depends,modules/priors): | .install/base/utils .install/base/logger
24-
$(call depends,modules/rtm): | .install/base/logger .install/modules/assim.batch
24+
$(call depends,modules/rtm): | .install/base/logger .install/modules/assim.batch .install/models/ed
2525
$(call depends,modules/uncertainty): | .install/base/utils .install/modules/priors .install/base/db .install/modules/emulator .install/base/logger
2626
$(call depends,models/biocro): | .install/base/logger .install/base/remote .install/base/utils .install/base/settings .install/modules/data.atmosphere .install/modules/data.land
2727
$(call depends,models/template): | .install/base/logger .install/base/utils

docker/base/Dockerfile.depends

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ RUN apt-get update \
1515
librdf0-dev \
1616
libnetcdf-dev \
1717
libudunits2-dev \
18+
libx11-dev \
19+
libgl1-mesa-dev \
20+
libglu1-mesa-dev \
21+
libfreetype6-dev \
1822
&& rm -rf /var/lib/apt/lists/*
1923

2024
# ----------------------------------------------------------------------

models/biocro/DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ Suggests:
2828
mockery (>= 0.3.0),
2929
PEcAn.DB,
3030
RPostgreSQL
31-
# Remotes:
32-
# github::ebimodeling/biocro
31+
Remotes:
32+
github::ebimodeling/biocro
3333
License: FreeBSD + file LICENSE
3434
Copyright: Energy Biosciences Institute, Authors
3535
LazyLoad: yes

release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if [ "${TAGS}" == "" ]; then
3232
fi
3333

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

0 commit comments

Comments
 (0)