Merge pull request #33 from zweidenker/remove-iceberg-dependency

Remove iceberg dependency
zweidenker · Jan 24, 2020 · 735089b · 735089b
2 parents ae9e701 + d2c4bcf
commit 735089b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -19,6 +19,7 @@ ARG CACHEBUST=1
 RUN \
     /opt/pharo /opt/SnapDump.image eval --save "Metacello new repository: 'filetree:///opt/source'; baseline: #SnapDump; load: #('server')" && \
     /opt/pharo /opt/SnapDump.image eval --save "SnapDump prepareForDeployment" && \
+    /opt/pharo /opt/SnapDump.image eval --save "SDServer version: '$DOCKER_TAG'" && \
     rm -rf /opt/pharo-local
 
 RUN \

diff --git a/source/SnapDump-Server/SDServer.class.st b/source/SnapDump-Server/SDServer.class.st
@@ -28,13 +28,6 @@ SDServer class >> port: aNumber path: aFileReference [
 		yourself
 ]
 
-{ #category : #accessing }
-SDServer class >> repositoryDescription [
-	| snapDumpRepo |
-	snapDumpRepo := IceRepository registry detect: [ :each | each name = 'SnapDump' ].
-	^ snapDumpRepo head description
-]
-
 { #category : #'as yet unclassified' }
 SDServer class >> startOnPort: aNumber path: aFileReference [
 	^ self instance 
@@ -51,7 +44,7 @@ SDServer class >> stop [
 
 { #category : #accessing }
 SDServer class >> version [
-	^ version
+	^ version ifNil: [ 'None' ]
 ]
 
 { #category : #accessing }

diff --git a/source/SnapDump-Server/SDServerDelegate.class.st b/source/SnapDump-Server/SDServerDelegate.class.st
@@ -12,7 +12,7 @@ SDServerDelegate >> serverError: request exception: exception [
 
 	[ self store storeSnapshot: (exception asSnapshot
 		projectName: 'SnapDump';
-		versionString: (SDServer version ifNil: [ 'None' ]);
+		versionString: SDServer version;
 		yourself ) ]
 		on: Error do: [ :err | "nothing we can do here" ]	.
 	^ super serverError: request exception: exception

diff --git a/source/SnapDump-Server/SDServerVersionCall.class.st b/source/SnapDump-Server/SDServerVersionCall.class.st
@@ -13,6 +13,6 @@ SDServerVersionCall class >> path [
 SDServerVersionCall >> get [	
 	response := ZnResponse ok: (
 		ZnEntity 
-			with: SDServer repositoryDescription
+			with: SDServer version
 			type: ZnMimeType applicationJson setCharSetUTF8)
 ]
diff --git a/source/SnapDump-Server/SnapDumpAPI.class.st b/source/SnapDump-Server/SnapDumpAPI.class.st
@@ -16,7 +16,7 @@ SnapDumpAPI class >> rootCallClass [
 SnapDumpAPI >> info [
 	^ OAInfo new 
 		description: 'SnapDump API';
-		version: '0.7';
+		version: SDSnapshot apiVersion;
 		title: 'SnapDump API';
 		contact: (OAContact new
 			name: 'Norbert Hartl';