Skip to content

Commit

Permalink
Replaced original Dockerfile.
Browse files Browse the repository at this point in the history
Moved standard logging to info instead of debug.
Re-enabled searchable metadata specification during bucket creation.
Updated version.
Minor bugfixes.
  • Loading branch information
DavidASeibert committed Aug 3, 2018
1 parent 0115983 commit bb4763c
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 5 deletions.
23 changes: 23 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#
# Copyright (c) 2018 EMC Corporation. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://www.apache.org/licenses/LICENSE-2.0.txt
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
#

FROM openjdk:8

EXPOSE 8080

WORKDIR /usr/src/app
COPY build/libs/ecs-browser-0.9.1.jar ./

CMD [ "java", "-jar", "ecs-browser-0.9.1.jar" ]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ On a linux or Mac, you can also start the application after building using the f
The application is then available at [http://localhost:8080](http://localhost:8080). The credentials page will prompt you for the information needed to connect to your ECS.
* `UID` - this is your S3 access key.
* `Secret` - this is your S3 secret key.
* `Endpoint` - ths is the full data endpoint including protocol and port, e.g., `https://object.ecstestdrive.com:443`, or `http://1.2.3.4:9020`.
* `Endpoint` - this is the full data endpoint including protocol and port, e.g., `https://object.ecstestdrive.com:443`, or `http://1.2.3.4:9020`.

LICENSING
--------------
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = "ECS browser website"
group = 'com.emc.ecs'
version = '0.9.0'
version = '0.9.1'

ext.licenseName = ''
ext.licenseUrl = ''
Expand Down Expand Up @@ -30,7 +30,7 @@ defaultTasks 'build'

jar {
baseName = 'ecs-browser'
version = '0.9.0'
version = '0.9.1'
into('META-INF/dependency-license') {
from 'build/reports/dependency-license'
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
logging.level.com.emc.ecs.browser.spring.ServiceFilter=DEBUG
logging.level.com.emc.ecs.browser.spring.ServiceFilter=INFO
#spring.jpa.properties.hibernate.show_sql=true
2 changes: 1 addition & 1 deletion src/main/resources/static/javascript/S3Browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ S3Browser.prototype.createBucketOrDirectory = function() {
}

var functionAddProperties = function( createObjectCallback ) {
if ( !entry.type ) {
if ( FileRow.ENTRY_TYPE.BUCKET == entry.type ) {
new BucketCreationPage( entry, browser.util, browser.templates, createObjectCallback );
} else {
createObjectCallback( {} );
Expand Down

0 comments on commit bb4763c

Please sign in to comment.