diff --git a/Dockerfile b/Dockerfile
index 1b2a703..0cd2339 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ WORKDIR /app
# Install dependencies
COPY Gemfile Gemfile.lock ./
-RUN bundle config set --local without 'development test' && bundle install --jobs 4 --retry 3
+RUN gem install bundler:2.4.21 && bundle config set --local without 'development test' && bundle install --jobs 4 --retry 3
# Copy the rest of the application files
COPY . .
@@ -23,9 +23,6 @@ FROM ruby:2.7.7-slim
RUN apt-get update -q && apt-get install -y --no-install-recommends \
nodejs
-# Add non-root user
-RUN useradd -ms /bin/bash safeuser
-
# Set the working directory
WORKDIR /app
@@ -36,4 +33,4 @@ COPY --from=base /usr/local/bundle /usr/local/bundle
EXPOSE 8080
# Start the Rails server
-CMD ["rails", "server", "-b", "0.0.0.0", "-e", "production", "-p", "8080"]
\ No newline at end of file
+CMD ["rails", "server", "-b", "0.0.0.0", "-e", "production", "-p", "8080"]
diff --git a/Gemfile b/Gemfile
index 9a89e04..13da280 100644
--- a/Gemfile
+++ b/Gemfile
@@ -55,7 +55,7 @@ gem 'json-schema'
# Alaska Data Integration working group schema definition
gem 'adiwg-mdjson_schemas', '2.8.1'
# Alaska Data Integration working group metadata translator
-gem 'adiwg-mdtranslator', '2.18.2'
+gem 'adiwg-mdtranslator', '2.18.4'
# Alaska Data Integration working group metadata code lists
gem 'adiwg-mdcodes', '2.8.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0172589..59babd5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,20 +56,20 @@ GEM
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ addressable (2.8.5)
+ public_suffix (>= 2.0.2, < 6.0)
adiwg-mdcodes (2.8.4)
json (~> 2.0)
adiwg-mdjson_schemas (2.8.1)
- adiwg-mdtranslator (2.18.2)
- adiwg-mdcodes (~> 2.8)
- adiwg-mdjson_schemas (~> 2.8)
+ adiwg-mdtranslator (2.18.4)
+ adiwg-mdcodes (= 2.8.4)
+ adiwg-mdjson_schemas (= 2.8.1)
builder (~> 3.2)
coderay (~> 1.1)
jbuilder (~> 2.5)
json (~> 2.0)
json-schema (~> 2.7)
- kramdown (~> 1.13)
+ kramdown (>= 1.13, < 3.0)
nokogiri (~> 1.7)
thor (~> 0.19)
uuidtools (~> 2.1)
@@ -141,7 +141,7 @@ GEM
racc (~> 1.4)
psych (4.0.3)
stringio
- public_suffix (5.0.3)
+ public_suffix (5.0.4)
puma (5.6.7)
nio4r (~> 2.0)
racc (1.7.1)
@@ -239,7 +239,7 @@ PLATFORMS
DEPENDENCIES
adiwg-mdcodes (= 2.8.4)
adiwg-mdjson_schemas (= 2.8.1)
- adiwg-mdtranslator (= 2.18.2)
+ adiwg-mdtranslator (= 2.18.4)
bootsnap (>= 1.4.2)
builder
coderay
@@ -249,7 +249,7 @@ DEPENDENCIES
json
json-schema
kramdown
- puma (~> 4.3.11)
+ puma (~> 5.6.7)
rack-cors
rack-proxy
rack-timeout
@@ -268,4 +268,4 @@ RUBY VERSION
ruby 2.7.7p221
BUNDLED WITH
- 2.4.21
\ No newline at end of file
+ 2.4.21
diff --git a/app/models/option.rb b/app/models/option.rb
index 0fdb08a..a5a3b25 100644
--- a/app/models/option.rb
+++ b/app/models/option.rb
@@ -12,7 +12,7 @@ class Option
def self.getOptionList
{
reader: %w[mdJson sbJson fgdc],
- writer: %w[iso19115_2 iso19110 html mdJson sbJson fgdc simple_html],
+ writer: %w[iso19115_3 iso19115_2 iso19110 html mdJson sbJson fgdc simple_html],
format: %w[auto plain json xml],
validate: %w[none normal strict],
showAllTags: %w[true false],
diff --git a/app/views/api/v3/demos/show.html.erb b/app/views/api/v3/demos/show.html.erb
index ea20e06..6e6d32d 100644
--- a/app/views/api/v3/demos/show.html.erb
+++ b/app/views/api/v3/demos/show.html.erb
@@ -77,8 +77,9 @@
-
-
+
+
+
diff --git a/app/views/api/writers/index.html.erb b/app/views/api/writers/index.html.erb
index 3628d77..2d1623d 100644
--- a/app/views/api/writers/index.html.erb
+++ b/app/views/api/writers/index.html.erb
@@ -23,7 +23,7 @@
: Federal Geographic Data Committee's Content Standard for Digital Geospatial Metadata - FGDC-STD-001-1998
Includes Biological Data Profile
- [iso19115_1](./writers/iso19115_1)
+ [iso19115_1](./writers/iso19115_1) (via iso19115_3)
: International Standards Organization Geographic Information - Metadata 19115-1:2014
@@ -31,6 +31,10 @@
: International Standards Organization Geographic Information - Metadata 19115-2:2009
+ [iso19115_3](./writers/iso19115_3)
+
+ : International Standards Organization Geographic Information - Metadata 19115-3:2014
+
[iso19110](./writers/iso19110)
: International Standards Organization Geographic Information - Feature Catalogue 19110:2005
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 3ef58b0..804d185 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -55,8 +55,8 @@ Alaska Ocean Observing Systems (AOOS), Nuna Technologies, U.S. Fish & Wildlife S
National Climate Change and Wildlife Science Centers (NCCWSC - USGS). Together these organizations developed
the six extensible components of the ADIwg ISO Metadata Developer's Toolkit listed below:
- * __mdJson__ - a simple but thorough JSON format for scientific metadata that fully supports the ISO 19115-1,
- ISO 19115-2, ISO 19110, FGDC, and other metadata standards.
+ * __mdJson__ - a simple but thorough JSON format for scientific metadata that fully supports the ISO 19115-1 (via ISO 19115-3),
+ ISO 19115-2/19139 (deprecated), ISO 19115-3, ISO 19110, FGDC, and other metadata standards.
* __mdTranslator__ - a public hosted web service for translation of mdJson to other metadata
standards. The mdTranslator is also available as a Ruby Gem 'adiwg-mdtranslator' and as source
code from our GitHub repository.